Attachment 875146 Details for Bug 1076925 – Use system iaxclient instead of bundled one

[patch] Use system iaxclient instead of bundled one

Use-system-iaxclient-instead-of-bundled-one.patch (text/plain), 5.17 KB, created by Ville Skyttä on 2014-03-16 15:23:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-16 15:23:06 UTC

Size: 5.17 KB

patch

obsolete

>From b3961743b3096ad197fa7a18f9f2200637c350e8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sun, 16 Mar 2014 17:21:48 +0200
>Subject: [PATCH] Use system iaxclient instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1076925
>---
> FlightGear.spec                         | 10 ++++--
> flightgear-3.0.0-system-iaxclient.patch | 57 +++++++++++++++++++++++++++++++++
> 2 files changed, 65 insertions(+), 2 deletions(-)
> create mode 100644 flightgear-3.0.0-system-iaxclient.patch
>
>diff --git a/FlightGear.spec b/FlightGear.spec
>index 37a95e7..f076841 100644
>--- a/FlightGear.spec
>+++ b/FlightGear.spec
>@@ -1,7 +1,7 @@
> Name:           FlightGear
> Summary:        The FlightGear Flight Simulator
> Version:        3.0.0
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> License:        GPLv2+
> Group:          Amusements/Games
> Source0:        http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
>@@ -16,6 +16,7 @@ Source6:        fg-128.png
> Source7:        COPYING
> Patch1:         0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
> Patch2:         0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
>+Patch3:         flightgear-3.0.0-system-iaxclient.patch
> 
> URL:            http://www.flightgear.org/
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>@@ -23,7 +24,7 @@ BuildRequires:  openal-soft-devel, SimGear-devel >= %{version}
> BuildRequires:  libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
> BuildRequires:  OpenSceneGraph-devel >= 3.0.0, boost-devel >= 1.44.0
> BuildRequires:  fltk-fluid, fltk-devel, dbus-devel, sqlite-devel
>-BuildRequires:  cmake, desktop-file-utils
>+BuildRequires:  cmake, desktop-file-utils, iaxclient-devel
> Requires:       FlightGear-data >= %{version}, opengl-games-utils
> Requires:       hicolor-icon-theme
> 
>@@ -37,6 +38,8 @@ expanded and improved upon by anyone interested in contributing
> %setup -q -n flightgear-%{version}
> %patch1 -p1
> %patch2 -p1
>+%patch3 -p1
>+rm -r 3rdparty
> 
> # make rpmlint happy
> find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
>@@ -120,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/flightgear
> 
> %changelog
>+* Sun Mar 16 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 3.0.0-3
>+- Use system iaxclient instead of bundled one
>+
> * Thu Feb 27 2014 Fabrice Bellet <fabrice@bellet.info> - 3.0.0-2
> - forgot to update the sources file
> 
>diff --git a/flightgear-3.0.0-system-iaxclient.patch b/flightgear-3.0.0-system-iaxclient.patch
>new file mode 100644
>index 0000000..4cc2500
>--- /dev/null
>+++ b/flightgear-3.0.0-system-iaxclient.patch
>@@ -0,0 +1,57 @@
>+diff -up flightgear-3.0.0/CMakeLists.txt~ flightgear-3.0.0/CMakeLists.txt
>+--- flightgear-3.0.0/CMakeLists.txt~	2014-02-17 10:58:14.000000000 +0200
>++++ flightgear-3.0.0/CMakeLists.txt	2014-03-16 15:19:32.068213687 +0200
>+@@ -364,7 +364,6 @@ include_directories(${OPENSCENEGRAPH_INC
>+ 
>+ include_directories(${PROJECT_SOURCE_DIR})
>+ include_directories(${PROJECT_SOURCE_DIR}/src)
>+-include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
>+ # following is needed, because config.h is include 'bare', whereas
>+ # version.h is included as <Include/version.h> - this should be cleaned up
>+ include_directories(${PROJECT_BINARY_DIR}/src)
>+@@ -387,7 +386,6 @@ configure_file (
>+     "${PROJECT_BINARY_DIR}/src/Include/version.h"
>+ )
>+ 
>+-add_subdirectory(3rdparty)
>+ add_subdirectory(utils)
>+ add_subdirectory(src)
>+ add_subdirectory(man)
>+diff -up flightgear-3.0.0/src/Main/CMakeLists.txt~ flightgear-3.0.0/src/Main/CMakeLists.txt
>+--- flightgear-3.0.0/src/Main/CMakeLists.txt~	2014-02-17 10:58:12.000000000 +0200
>++++ flightgear-3.0.0/src/Main/CMakeLists.txt	2014-03-16 15:02:05.097541681 +0200
>+@@ -90,7 +90,7 @@ if(ENABLE_JSBSIM)
>+     target_link_libraries(fgfs JSBSim)
>+ endif()
>+ if(ENABLE_IAX)
>+-    target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY})
>++    target_link_libraries(fgfs iaxclient ${OPENAL_LIBRARY})
>+ endif()
>+ if(USE_DBUS)
>+     target_link_libraries(fgfs ${DBUS_LIBRARIES})
>+diff -up flightgear-3.0.0/src/Network/fgcom.cxx~ flightgear-3.0.0/src/Network/fgcom.cxx
>+--- flightgear-3.0.0/src/Network/fgcom.cxx~	2014-02-17 10:58:11.000000000 +0200
>++++ flightgear-3.0.0/src/Network/fgcom.cxx	2014-03-16 14:59:37.351351389 +0200
>+@@ -39,7 +39,7 @@
>+ #include <Airports/airport.hxx>
>+ #include <Navaids/navlist.hxx>
>+ 
>+-#include <3rdparty/iaxclient/lib/iaxclient.h>
>++#include <iaxclient.h>
>+ 
>+ 
>+ #define NUM_CALLS 4
>+diff -up flightgear-3.0.0/utils/fgcom/CMakeLists.txt~ flightgear-3.0.0/utils/fgcom/CMakeLists.txt
>+--- flightgear-3.0.0/utils/fgcom/CMakeLists.txt~	2014-02-17 10:58:14.000000000 +0200
>++++ flightgear-3.0.0/utils/fgcom/CMakeLists.txt	2014-03-16 15:02:39.162277359 +0200
>+@@ -39,9 +39,7 @@
>+     if(WIN32)
>+         set_target_properties( ${name} PROPERTIES DEBUG_POSTFIX d )
>+     endif()
>+-    target_link_libraries( ${name} iaxclient_lib )
>+-    # this could be just on a target basis, but for now
>+-    include_directories( ${CMAKE_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
>++    target_link_libraries( ${name} iaxclient )
>+     # Now include simgear libraries 
>+     target_link_Libraries( ${name}
>+         ${OPENAL_LIBRARY}
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1076925: 875146