[FlightGear-Atlas] add libpthread to link Atlas

Fabrice Bellet bellet at fedoraproject.org
Wed Mar 6 18:11:02 UTC 2013


commit 9a04e626f6e50dda0601096f34d2baab93c415e2
Author: Fabrice Bellet <fabrice at bellet.info>
Date:   Wed Mar 6 19:10:58 2013 +0100

    add libpthread to link Atlas

 Atlas-0.4.9-init-render-config-dialog.patch |   12 ++++++++++++
 Atlas-0.4.9-pthread.patch                   |   12 ++++++++++++
 FlightGear-Atlas.spec                       |    7 ++++++-
 3 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/Atlas-0.4.9-init-render-config-dialog.patch b/Atlas-0.4.9-init-render-config-dialog.patch
new file mode 100644
index 0000000..bceee0e
--- /dev/null
+++ b/Atlas-0.4.9-init-render-config-dialog.patch
@@ -0,0 +1,12 @@
+diff -uNrp Atlas.orig/src/AtlasWindow.cxx Atlas/src/AtlasWindow.cxx
+--- Atlas.orig/src/AtlasWindow.cxx	2012-09-11 13:29:08.000000000 +0200
++++ Atlas/src/AtlasWindow.cxx	2012-09-18 21:47:15.156403395 +0200
+@@ -3157,7 +3157,7 @@ AtlasWindow::AtlasWindow(const char *nam
+     AtlasBaseWindow(name, regularFontFile, boldFontFile), _ac(ac), 
+     _dragging(false), _lightingPrefixKey(false), _debugPrefixKey(false), 
+     _overlays(NULL), _showOutlines(false), _exitOkDialog(NULL), 
+-    _searchTimerScheduled(false)
++    _renderConfirmDialog(NULL), _searchTimerScheduled(false)
+ {
+     // Initialize OpenGL, starting with clearing (background) color
+     // and enabling depth testing.
diff --git a/Atlas-0.4.9-pthread.patch b/Atlas-0.4.9-pthread.patch
new file mode 100644
index 0000000..e71f428
--- /dev/null
+++ b/Atlas-0.4.9-pthread.patch
@@ -0,0 +1,12 @@
+diff -uNrp Atlas.orig/configure.ac Atlas.new/configure.ac
+--- Atlas.orig/configure.ac	2012-01-30 22:28:24.000000000 +0100
++++ Atlas.new/configure.ac	2013-03-06 18:51:03.770995842 +0100
+@@ -181,6 +181,8 @@ base_LIBS="$LIBS"
+ 
+ AC_CHECK_LIB(pthread, pthread_exit)
+ 
++base_LIBS="$base_LIBS -lpthread"
++
+ dnl check for OpenGL related libraries
+ 
+ case "${host}" in
diff --git a/FlightGear-Atlas.spec b/FlightGear-Atlas.spec
index 7992d63..b1bfab0 100644
--- a/FlightGear-Atlas.spec
+++ b/FlightGear-Atlas.spec
@@ -3,13 +3,14 @@
 Name:           FlightGear-Atlas
 Summary:        Flightgear map tools
 Version:        0.4.9
-Release:        0.9%{snapshot}%{?dist}
+Release:        0.10%{snapshot}%{?dist}
 
 License:        GPLv2+
 Group:          Amusements/Games
 Source0:        Atlas-%{version}%{snapshot}.tar.bz2
 Source1:        Atlas-0.4.0-default-maps.tar.gz
 Patch0:         Atlas-0.4.9-init-render-config-dialog.patch
+Patch1:         Atlas-0.4.9-pthread.patch
 URL:            http://atlas.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  freeglut-devel, curl-devel, libpng-devel, glew-devel
@@ -27,6 +28,7 @@ Atlas viewer
 %prep
 %setup -q -n Atlas
 %patch0 -p1
+%patch1 -p1
 find -type f -name '*.[hc]xx' -exec chmod a-x {} \;
 
 %build
@@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/flightgear/Atlas
 
 %changelog
+* Wed Mar 06 2013 Fabrice Bellet <fabrice at bellet.info> - 0.4.9-0.10.cvs20120911
+- add libpthread to link Atlas
+
 * Mon Feb 18 2013 Fabrice Bellet <fabrice at bellet.info> - 0.4.9-0.9.cvs20120911
 - rebuilt with newer SimGear
 


More information about the scm-commits mailing list