Attachment 874886 Details for Bug 1076851 – Build with system tinyxml

[patch] Build with system tinyxml

Build-with-system-tinyxml.patch (text/plain), 1.65 KB, created by Ville Skyttä on 2014-03-15 19:03:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-15 19:03:54 UTC

Size: 1.65 KB

patch

obsolete

>From 53b03633e9dd52e70a6d9ada4aeb8fbe0ad8a352 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 15 Mar 2014 21:02:47 +0200
>Subject: [PATCH] Build with system tinyxml
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1076851
>---
> aqsis.spec | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/aqsis.spec b/aqsis.spec
>index fd62e16..ea80dd8 100644
>--- a/aqsis.spec
>+++ b/aqsis.spec
>@@ -1,6 +1,6 @@
> Name:		aqsis
> Version:	1.8.2
>-Release:	8%{?dist}
>+Release:	9%{?dist}
> Summary:	Open source 3D rendering solution adhering to the RenderMan standard
> Group:		Applications/Multimedia
> 
>@@ -25,7 +25,7 @@ BuildRequires:  libtiff-devel >= 3.7.1
> BuildRequires:  libpng-devel
> BuildRequires:  libxslt
> BuildRequires:  qt4-devel >= 4.6.2
>-#BuildRequires:  tinyxml-devel
>+BuildRequires:  tinyxml-devel
> BuildRequires:  OpenEXR-devel
> BuildRequires:  python-sphinx
> BuildRequires:  zlib-devel >= 1.1.4
>@@ -104,7 +104,7 @@ integration with third-party applications.
> 
> %prep
> %setup -q
>-
>+rm thirdparty/tinyxml/tiny*
> %patch1 -p1 -b imfinputfile-forward-declaration
> 
> 
>@@ -127,7 +127,7 @@ pushd build
>   -DAQSIS_BOOST_THREAD_LIBRARY_NAME=boost_thread-mt \
>   -DAQSIS_BOOST_WAVE_LIBRARY_NAME=boost_wave-mt \
>   -DCMAKE_CXX_FLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=3" \
>-  -DAQSIS_USE_EXTERNAL_TINYXML:BOOL=OFF ..
>+  -DAQSIS_USE_EXTERNAL_TINYXML:BOOL=ON ..
> 
> make VERBOSE=1 %{?_smp_mflags}
> 
>@@ -251,6 +251,9 @@ fi || :
> 
> 
> %changelog
>+* Sat Mar 15 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.8.2-9
>+- Build with system tinyxml
>+
> * Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.8.2-8
> - rebuild (openexr)
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1076851: 874886