- updated to 2.10.0

diff --git a/FlightGear-libs.patch b/FlightGear-libs.patch
deleted file mode 100644 (file)
index 42f52cb..0000000
--- a/FlightGear-libs.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -burN FlightGear-0.9.6.orig/src/Airports/Makefile.am FlightGear-0.9.6/src/Airports/Makefile.am
---- FlightGear-0.9.6.orig/src/Airports/Makefile.am     2004-11-01 17:13:02.183256960 +0100
-+++ FlightGear-0.9.6/src/Airports/Makefile.am  2004-11-01 17:13:54.304333352 +0100
-@@ -7,6 +7,7 @@
-       simple.cxx simple.hxx
- 
- calc_loc_SOURCES = calc_loc.cxx
--calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS)
-+calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) \
-+               -lsgprops -lsgstructure -lsgxml
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -burN FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am FlightGear-0.9.6/src/FDM/YASim/Makefile.am
---- FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am    2004-11-01 17:13:02.016282344 +0100
-+++ FlightGear-0.9.6/src/FDM/YASim/Makefile.am 2004-11-01 17:14:28.542128416 +0100
-@@ -43,9 +43,9 @@
- 
- yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
- 
--yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
-+yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
- 
- proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
--proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
-+proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -burN FlightGear-0.9.6.orig/src/Main/Makefile.am FlightGear-0.9.6/src/Main/Makefile.am
---- FlightGear-0.9.6.orig/src/Main/Makefile.am 2004-11-01 17:13:02.143263040 +0100
-+++ FlightGear-0.9.6/src/Main/Makefile.am      2004-11-01 17:15:10.865694256 +0100
-@@ -104,6 +104,6 @@
- metar_LDADD = \
-         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
-         -lplibnet -lplibul $(network_LIBS) \
--        -lz $(base_LIBS)
-+        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -burN FlightGear-0.9.6.orig/src/Navaids/Makefile.am FlightGear-0.9.6/src/Navaids/Makefile.am
---- FlightGear-0.9.6.orig/src/Navaids/Makefile.am      2004-11-01 17:13:02.239248448 +0100
-+++ FlightGear-0.9.6/src/Navaids/Makefile.am   2004-11-01 17:15:37.842593144 +0100
-@@ -15,6 +15,6 @@
- # testnavs_LDADD = \
- #     libNavaids.a \
- #     -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
--#     -lsgstructure $(base_LIBS) -lz
-+#     -lsgstructure $(base_LIBS) -lz -lsgprops
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -burN FlightGear-0.9.6.orig/tests/Makefile.am FlightGear-0.9.6/tests/Makefile.am
---- FlightGear-0.9.6.orig/tests/Makefile.am    2004-11-01 17:13:02.274243128 +0100
-+++ FlightGear-0.9.6/tests/Makefile.am 2004-11-01 17:15:59.265336392 +0100
-@@ -17,4 +17,4 @@
- test_text_SOURCES = test-text.cxx
- 
- test_up_SOURCES = test-up.cxx
--test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS)
-+test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) -lsgprops
---- FlightGear-0.9.9.org/src/GUI/Makefile.am   2005-07-30 16:20:24.000000000 +0200
-+++ FlightGear-0.9.9/src/GUI/Makefile.am       2005-12-07 22:09:58.000000000 +0100
-@@ -22,4 +22,6 @@
- 
- layout_test_LDADD = libGUI.a \
-                     -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \
--                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS)
-+                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) \
-+                  -lxml
-+
---- FlightGear-0.9.10/utils/GPSsmooth/Makefile.am.orig 2006-08-16 20:29:39.000000000 -0700
-+++ FlightGear-0.9.10/utils/GPSsmooth/Makefile.am      2006-08-16 20:36:00.000000000 -0700
-@@ -5,7 +5,7 @@
-       gps_main.cxx
- 
- GPSsmooth_LDADD = \
--      -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul \
-+      -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul -lsgprops -lsgxml -lsgmisc -lsgstructure \
-       $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
- 
- MIDGsmooth_SOURCES = \
-@@ -13,7 +13,7 @@
-       MIDG_main.cxx
- 
- MIDGsmooth_LDADD = \
--      -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \
-+      -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug -lsgstructure -lsgprops -lsgxml \
-       -lplibnet -lplibul \
-       $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
- 
---- FlightGear-0.9.10/utils/Modeller/Makefile.am.orig  2006-08-16 20:36:44.000000000 -0700
-+++ FlightGear-0.9.10/utils/Modeller/Makefile.am       2006-08-16 20:38:58.000000000 -0700
-@@ -8,4 +8,6 @@
- animassist_LDADD = $(base_LIBS)
- 
- normalmap_SOURCES = normalmap.cxx
--normalmap_LDADD = -lsgscreen $(opengl_LIBS) $(base_LIBS) -lz
-+normalmap_LDADD = -lsgscreen -lsgdebug \
-+      -lplibssg -lplibsg -lplibul \
-+      $(opengl_LIBS) $(base_LIBS) -lz
---- FlightGear-0.9.10/src/Main/metar_main.cxx.orig     2006-08-16 20:26:14.000000000 -0700
-+++ FlightGear-0.9.10/src/Main/metar_main.cxx  2006-08-16 20:26:55.000000000 -0700
-@@ -28,6 +28,10 @@
- #include <simgear/environment/metar.hxx>
- #include <simgear/structure/exception.hxx>
- 
-+// Not really used there definitions - just to fix missing symbol in libsgsky.so.
-+class SGSky;
-+SGSky *thesky;
-+
- using namespace std;
- 
- // text color
---- FlightGear-0.9.10/src/Main/Makefile.am.mkorig      2006-08-17 14:09:38.000000000 -0700
-+++ FlightGear-0.9.10/src/Main/Makefile.am     2006-08-17 14:16:55.000000000 -0700
-@@ -106,8 +106,9 @@
- metar_SOURCES = metar_main.cxx
- 
- metar_LDADD = \
--        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
--        -lplibnet -lplibul $(network_LIBS) \
--        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
-+        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug -lsgsky  \
-+        -lplibnet -lplibul -lplibsg -lplibssg -lopenal $(network_LIBS) \
-+        -lz -lGLU $(base_LIBS) -lsgserial -lsgprops -lsgxml -lsgscreen -lsgsound -lsgmath
-+
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim

diff --git a/FlightGear.spec b/FlightGear.spec
index 893c876c7c1992eb7e774a7ddb9a3b15e2d3b256..83478ee4c3349597cc6a7b878d452204e9db3750 100644 (file)
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -5,32 +5,30 @@
 Summary:       Free Flight Simulator
 Summary(pl.UTF-8):     darmowy symulator lotu
 Name:          FlightGear
-Version:       0.9.10
-Release:       1
+Version:       2.10.0
+Release:       0.2
 License:       GPL
 Group:         X11/Applications/Games
-Source0:       ftp://ftp.flightgear.org/pub/fgfs/Source/%{name}-%{version}.tar.gz
-# Source0-md5: f4b89c9cafc18d56beab77a04f1ebdce
-Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.bz2
-# Source1-md5: 0ff82689a1877de95490c429e717d8a2
-Source2:       ftp://ftp.flightgear.org/pub/fgfs/Everything-0.7/Base-Packages/fgfs-docs-0.7.7.tar.gz
-# Source2-md5: 31f35d3e63e522565e8990ead99e7507
-Patch0:                %{name}-libs.patch
+Source0:       ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
+# Source0-md5: ae7fc8d1e446c5d1fe2aa82ee41dcac5
+Source1:       ftp://flightgear.wo0t.de/ftp/Shared/FlightGear-data-%{version}.tar.bz2
+# Source1-md5: 82a9cbc81313195a7ed1aa87a9a2a0b3
+#Source2:      ftp://ftp.flightgear.org/pub/fgfs/Everything-0.7/Base-Packages/fgfs-docs-0.7.7.tar.gz
+## Source2-md5:        31f35d3e63e522565e8990ead99e7507
+Patch0:                flightgear-cmake.patch
+Patch1:                flightgear-shader.patch
 URL:           http://www.flightgear.org/
+BuildRequires: cmake
 BuildRequires: OpenAL-devel
 BuildRequires: OpenGL-devel
-BuildRequires: SimGear-devel >= 0.3.10
-BuildRequires: XFree86-devel
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
+BuildRequires: SimGear-devel = %{version}
 BuildRequires: glut-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libxml-devel
-BuildRequires: metakit-devel >= 2.4.3
 BuildRequires: plib-devel >= 1.8.4
 BuildRequires: zlib-devel
 Requires:      OpenGL
-Requires:      SimGear >= 0.3.10
+Requires:      OpenSceneGraph-plugins
 Requires:      plib >= 1.8.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,33 +45,28 @@ Projekt Flight Gear to wyrafinowany symulator lotów pozwalający
 rozpowszechniać idee tego typu symulacji.
 
 %prep
-%setup -q -a 1 -a 2
+%setup -q -n flightgear-%{version} -a 1
 %patch0 -p1
+%patch1 -p1
 
 find %{name} -name 'CVS' -type d | xargs rm -rf
 
 %build
-rm -f missing
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-       --with-network-olk \
-       --with-multiplayer \
-       --libdir=%{_datadir}/games
+install -d build
+cd build
+%cmake ../
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/games
+install -d $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
 echo "#!/bin/sh" > runfgfs
 echo "exec %{_bindir}/fgfs --fg-root=%{_datadir}/games/%{name} \$*" >> runfgfs
 install runfgfs $RPM_BUILD_ROOT%{_bindir}
-cp -a %{name} $RPM_BUILD_ROOT%{_datadir}/games
 cp -R data $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 
 %clean
@@ -81,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS %{name}/Docs/*
+%doc AUTHORS NEWS docs-mini/*
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/games/%{name}
 %{_mandir}/*/*

diff --git a/flightgear-cmake.patch b/flightgear-cmake.patch
new file mode 100644 (file)
index 0000000..ff29651
--- /dev/null
+++ b/flightgear-cmake.patch
@@ -0,0 +1,10 @@
+--- flightgear-2.10.0/utils/fgadmin/src/CMakeLists.txt-orig    2012-06-26 22:06:15.000000000 +0200
++++ flightgear-2.10.0/utils/fgadmin/src/CMakeLists.txt 2013-03-22 14:09:25.876770608 +0100
+@@ -1,6 +1,6 @@
+ 
+ fltk_wrap_ui(FGAdminUI fgadmin.fl)
+-add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS})
++add_library(FGAdminUI STATIC ${FGAdminUI_FLTK_UI_SRCS})
+ 
+ add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
+ add_dependencies(fgadmin FGAdminUI)

diff --git a/flightgear-shader.patch b/flightgear-shader.patch
new file mode 100644 (file)
index 0000000..52e67ee
--- /dev/null
+++ b/flightgear-shader.patch
@@ -0,0 +1,15 @@
+--- flightgear-2.10.0/data/Shaders/urban.frag.old      2013-01-28 17:23:45.000000000 +0100
++++ flightgear-2.10.0/data/Shaders/urban.frag  2013-03-27 10:12:06.993411375 +0100
+@@ -90,8 +90,10 @@
+                 #ifdef USE_QDM_ASCEND_INTERVAL
+                 if(frac(level*0.5) > EPSILON)
+                   level++;
+-                #elseif USE_QDM_ASCEND_CONST
+-                 level++;
++                #else
++                  #ifdef USE_QDM_ASCEND_CONST
++                    level++;
++                  #endif
+                 #endif
+             }
+             p2 = p + v * d;