[packages/SimGear] - updated to 2.10.0
bszx
bszx at pld-linux.org
Sun Mar 24 00:22:05 CET 2013
commit 80e1d6f29d80c6cedef3f773b4878b4edf994039
Author: Bartek Szady <bszx at pld-linux.org>
Date: Sun Mar 24 00:07:51 2013 +0100
- updated to 2.10.0
SimGear-cstdio.patch | 10 -
SimGear-link.patch | 321 ------------------------
SimGear-shared.patch | 681 ---------------------------------------------------
SimGear-tgdb.patch | 10 -
SimGear.spec | 153 ++----------
5 files changed, 23 insertions(+), 1152 deletions(-)
---
diff --git a/SimGear.spec b/SimGear.spec
index b156e9c..cfa9459 100644
--- a/SimGear.spec
+++ b/SimGear.spec
@@ -1,37 +1,27 @@
#
-# TODO: - Add missing BRs for xorg
-# - Consider getting back to static linking or set sonames for shared libraries
-# - Still some undefined references (ldd -r /usr/lib/libsgprops.so after install is good example)
+# TODO: - bring back static libraries
#
Summary: A set of libraries to build 3d simulations, games etc
Summary(pl.UTF-8): Zestaw bibliotek do budowania trójwymiarowych symulacji, gier itp
Name: SimGear
-Version: 1.9.1
-Release: 0.3
+Version: 2.10.0
+Release: 0.2
License: GPL v2+
Group: Libraries
-Source0: ftp://ftp.simgear.org/pub/simgear/Source/%{name}-%{version}.tar.gz
-# Source0-md5: edfdaa60518a06699a409d0eb9f1b157
-Patch0: %{name}-shared.patch
-Patch1: %{name}-link.patch
-Patch2: %{name}-cstdio.patch
-Patch3: %{name}-tgdb.patch
+Source0: ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-%{version}.tar.bz2
+# Source0-md5: 0ec974d3778f777d5c99c89db671fcc7
URL: http://simgear.sourceforge.net/
BuildRequires: OpenAL-devel
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-glut-devel
-BuildRequires: OpenSceneGraph-devel
-#BuildRequires: XFree86-devel
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
+BuildRequires: OpenSceneGraph-devel >=3.0.0
+BuildRequires: cmake
BuildRequires: freealut-devel
+BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel
-BuildRequires: libtool
-BuildRequires: metakit-devel >= 2.4.3
-BuildRequires: plib-devel >= 1.8.4-3
+BuildRequires: subversion-devel
BuildRequires: zlib-devel
Requires: OpenGL
-Requires: plib >= 1.8.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
@@ -59,7 +49,6 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: OpenAL-devel
Requires: OpenGL-devel
-Requires: plib-devel >= 1.8.0
%description devel
Header files neccessary to build SimGear applications.
@@ -80,25 +69,18 @@ Static SimGear libraries.
Statyczne biblioteki SimGear.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q -n simgear-%{version}
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
- --with-x
-%{__make} -j 2
+install -d build
+cd build
+%cmake -DSIMGEAR_SHARED=ON -DSYSTEM_EXPAT=ON -DJPEG_FACTORY=ON ../
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
@@ -109,105 +91,16 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS NEWS
-%attr(755,root,root) %{_libdir}/libsgbucket.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgbucket.so.0
-%attr(755,root,root) %{_libdir}/libsgdebug.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgdebug.so.0
-%attr(755,root,root) %{_libdir}/libsgenvironment.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgenvironment.so.0
-%attr(755,root,root) %{_libdir}/libsgephem.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgephem.so.0
-%attr(755,root,root) %{_libdir}/libsgio.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgio.so.0
-%attr(755,root,root) %{_libdir}/libsgmagvar.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgmagvar.so.0
-%attr(755,root,root) %{_libdir}/libsgmaterial.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgmaterial.so.0
-%attr(755,root,root) %{_libdir}/libsgmath.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgmath.so.0
-%attr(755,root,root) %{_libdir}/libsgmisc.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgmisc.so.0
-%attr(755,root,root) %{_libdir}/libsgmodel.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgmodel.so.0
-%attr(755,root,root) %{_libdir}/libsgnasal.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgnasal.so.0
-%attr(755,root,root) %{_libdir}/libsgprops.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgprops.so.0
-%attr(755,root,root) %{_libdir}/libsgroute.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgroute.so.0
-%attr(755,root,root) %{_libdir}/libsgscreen.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgscreen.so.0
-%attr(755,root,root) %{_libdir}/libsgserial.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgserial.so.0
-%attr(755,root,root) %{_libdir}/libsgsky.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgsky.so.0
-%attr(755,root,root) %{_libdir}/libsgsound.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgsound.so.0
-%attr(755,root,root) %{_libdir}/libsgstructure.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgstructure.so.0
-%attr(755,root,root) %{_libdir}/libsgtgdb.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgtgdb.so.0
-%attr(755,root,root) %{_libdir}/libsgthreads.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgthreads.so.0
-%attr(755,root,root) %{_libdir}/libsgtiming.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgtiming.so.0
-%attr(755,root,root) %{_libdir}/libsgutil.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgutil.so.0
-%attr(755,root,root) %{_libdir}/libsgxml.so.0.0.0
-%attr(755,root,root) %ghost %{_libdir}/libsgxml.so.0
+%doc AUTHORS NEWS Thanks
+%attr(755,root,root) %{_libdir}/libSimGearCore.so.2.10.0
+%attr(755,root,root) %{_libdir}/libSimGearScene.so.2.10.0
%files devel
%defattr(644,root,root,755)
-%doc TODO
-%attr(755,root,root) %{_libdir}/libsgbucket.so
-%attr(755,root,root) %{_libdir}/libsgdebug.so
-%attr(755,root,root) %{_libdir}/libsgenvironment.so
-%attr(755,root,root) %{_libdir}/libsgephem.so
-%attr(755,root,root) %{_libdir}/libsgio.so
-%attr(755,root,root) %{_libdir}/libsgmagvar.so
-%attr(755,root,root) %{_libdir}/libsgmaterial.so
-%attr(755,root,root) %{_libdir}/libsgmath.so
-%attr(755,root,root) %{_libdir}/libsgmisc.so
-%attr(755,root,root) %{_libdir}/libsgmodel.so
-%attr(755,root,root) %{_libdir}/libsgnasal.so
-%attr(755,root,root) %{_libdir}/libsgprops.so
-%attr(755,root,root) %{_libdir}/libsgroute.so
-%attr(755,root,root) %{_libdir}/libsgscreen.so
-%attr(755,root,root) %{_libdir}/libsgserial.so
-%attr(755,root,root) %{_libdir}/libsgsky.so
-%attr(755,root,root) %{_libdir}/libsgsound.so
-%attr(755,root,root) %{_libdir}/libsgstructure.so
-%attr(755,root,root) %{_libdir}/libsgtgdb.so
-%attr(755,root,root) %{_libdir}/libsgthreads.so
-%attr(755,root,root) %{_libdir}/libsgtiming.so
-%attr(755,root,root) %{_libdir}/libsgutil.so
-%attr(755,root,root) %{_libdir}/libsgxml.so
-%{_libdir}/libsgbucket.la
-%{_libdir}/libsgdebug.la
-%{_libdir}/libsgenvironment.la
-%{_libdir}/libsgephem.la
-%{_libdir}/libsgio.la
-%{_libdir}/libsgmagvar.la
-%{_libdir}/libsgmaterial.la
-%{_libdir}/libsgmath.la
-%{_libdir}/libsgmisc.la
-%{_libdir}/libsgmodel.la
-%{_libdir}/libsgnasal.la
-%{_libdir}/libsgprops.la
-%{_libdir}/libsgroute.la
-%{_libdir}/libsgscreen.la
-%{_libdir}/libsgserial.la
-%{_libdir}/libsgsky.la
-%{_libdir}/libsgsound.la
-%{_libdir}/libsgstructure.la
-%{_libdir}/libsgtgdb.la
-%{_libdir}/libsgthreads.la
-%{_libdir}/libsgtiming.la
-%{_libdir}/libsgutil.la
-%{_libdir}/libsgxml.la
+%attr(755,root,root) %{_libdir}/libSimGearCore.so
+%attr(755,root,root) %{_libdir}/libSimGearScene.so
%{_includedir}/simgear
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+#%#files static
+#%#defattr(644,root,root,755)
+#%#{_libdir}/lib*.a
diff --git a/SimGear-cstdio.patch b/SimGear-cstdio.patch
deleted file mode 100644
index a849794..0000000
--- a/SimGear-cstdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SimGear-1.9.1/simgear/debug/logstream.hxx~ 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/debug/logstream.hxx 2009-07-01 12:20:39.000000000 +0200
-@@ -33,6 +33,7 @@
-
- #include <streambuf>
- #include <ostream>
-+#include <cstdio>
-
- #include <simgear/debug/debug_types.h>
-
diff --git a/SimGear-link.patch b/SimGear-link.patch
deleted file mode 100644
index 9ab366b..0000000
--- a/SimGear-link.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff -uNr SimGear-1.9.1.orig/simgear/bucket/Makefile.am SimGear-1.9.1/simgear/bucket/Makefile.am
---- SimGear-1.9.1.orig/simgear/bucket/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/bucket/Makefile.am 2009-08-12 11:13:26.000000000 +0200
-@@ -5,6 +5,8 @@
- include_HEADERS = newbucket.hxx
-
- libsgbucket_la_SOURCES = newbucket.cxx
-+libsgbucket_la_LIBADD = \
-+ $(top_builddir)/simgear/misc/libsgmisc.la
-
- # noinst_PROGRAMS = testbucket
-
-diff -uNr SimGear-1.9.1.orig/simgear/environment/Makefile.am SimGear-1.9.1/simgear/environment/Makefile.am
---- SimGear-1.9.1.orig/simgear/environment/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/environment/Makefile.am 2009-08-12 13:25:18.000000000 +0200
-@@ -6,4 +6,13 @@
-
- libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
-
-+libsgenvironment_la_LIBADD = \
-+ $(top_builddir)/simgear/io/libsgio.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/scene/sky/libsgsky.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ -losg \
-+ -losgParticle
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am SimGear-1.9.1/simgear/ephemeris/Makefile.am
---- SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/ephemeris/Makefile.am 2009-08-12 12:30:32.000000000 +0200
-@@ -31,4 +31,8 @@
- uranus.cxx \
- venus.cxx
-
-+libsgephem_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am
---- SimGear-1.9.1.orig/simgear/io/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -20,6 +20,14 @@
- sg_socket.cxx \
- sg_socket_udp.cxx
-
-+libsgio_la_LIBADD = \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ -lplibnet \
-+ -lz
-+
- INCLUDES = -I$(top_srcdir)
-
- noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
-diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am
---- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -52,4 +52,8 @@
- SGGeod.cxx \
- SGGeodesy.cxx
-
-+libsgmath_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am
---- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -24,6 +24,14 @@
- interpolator.cxx \
- PathOptions.cxx
-
-+libsgmisc_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ -lz \
-+ -losg \
-+ -losgDB
-+
- noinst_PROGRAMS = tabbed_value_test swap_test
-
- tabbed_value_test_SOURCES = tabbed_values_test.cxx
-diff -uNr SimGear-1.9.1.orig/simgear/nasal/Makefile.am SimGear-1.9.1/simgear/nasal/Makefile.am
---- SimGear-1.9.1.orig/simgear/nasal/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/nasal/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -10,4 +10,8 @@
- thread-posix.c thread-win32.c threadlib.c \
- utf8lib.c vector.c
-
-+libsgnasal_la_LIBADD = \
-+ -lm \
-+ -lpthread
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am
---- SimGear-1.9.1.orig/simgear/props/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -12,6 +12,9 @@
- props.cxx \
- props_io.cxx
-
-+libsgprops_la_LIBADD = \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la
-
- # NOTE: Looped dependencies misc and props test files, commenting this one out
- # noinst_PROGRAMS = props_test
-diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am
---- SimGear-1.9.1.orig/simgear/route/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -8,6 +8,9 @@
- route.cxx \
- waypoint.cxx
-
-+libsgroute_la_LIBADD = \
-+ $(top_builddir)/simgear/math/libsgmath.la
-+
- INCLUDES = -I$(top_srcdir)
-
- noinst_PROGRAMS = waytest routetest
-diff -uNr SimGear-1.9.1.orig/simgear/scene/Makefile.am SimGear-1.9.1/simgear/scene/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/Makefile.am 2009-08-12 14:33:12.000000000 +0200
-@@ -1,7 +1,6 @@
- includedir = @includedir@/scene
-
--SUBDIRS = material model sky tgdb util
--
-+SUBDIRS = util tgdb model material sky
- # lib_LIBRARIES = libsgscene.a
-
- # noinst_HEADERS =
-diff -uNr SimGear-1.9.1.orig/simgear/scene/material/Makefile.am SimGear-1.9.1/simgear/scene/material/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/material/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/scene/material/Makefile.am 2009-08-12 13:49:46.000000000 +0200
-@@ -14,4 +14,15 @@
- matlib.cxx \
- matmodel.cxx
-
-+libsgmaterial_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/scene/model/libsgmodel.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ -losg \
-+ -losgDB \
-+ -lplibul
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/scene/model/Makefile.am 2009-08-12 13:29:53.000000000 +0200
-@@ -46,4 +46,19 @@
- SGScaleTransform.cxx \
- SGTranslateTransform.cxx
-
-+libsgmodel_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/screen/libsgscreen.la \
-+ $(top_builddir)/simgear/scene/tgdb/libsgtgdb.la \
-+ $(top_builddir)/simgear/scene/util/libsgutil.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ -lGL \
-+ -losg \
-+ -losgDB \
-+ -losgParticle \
-+ -losgUtil
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am SimGear-1.9.1/simgear/scene/sky/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/scene/sky/Makefile.am 2009-08-12 13:47:18.000000000 +0200
-@@ -28,4 +28,17 @@
- newcloud.cxx \
- CloudShaderGeometry.cxx
-
-+libsgsky_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/scene/model/libsgmodel.la \
-+ $(top_builddir)/simgear/scene/util/libsgutil.la \
-+ $(top_builddir)/simgear/screen/libsgscreen.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ -losg \
-+ -losgDB \
-+ -lGL \
-+ -lGLU
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.1/simgear/scene/tgdb/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am 2009-08-12 15:05:23.000000000 +0200
-@@ -40,4 +39,21 @@
- TileEntry.cxx \
- TreeBin.cxx TreeBin.hxx
-
-+libsgtgdb_la_LIBADD = \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/io/libsgio.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ -lGL \
-+ -losg \
-+ -losgDB \
-+ -losgUtil
-+
-+# $(top_builddir)/scene/util/libsutil.la
-+# $(top_builddir)/scene/model/libsgmodel.la
-+# $(top_builddir)/scene/material/libsgmaterial.la
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/scene/util/Makefile.am SimGear-1.9.1/simgear/scene/util/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/util/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/scene/util/Makefile.am 2009-08-12 11:55:02.000000000 +0200
-@@ -31,4 +31,8 @@
- StateAttributeFactory.cxx \
- QuadTreeBuilder.cxx
-
-+libsgutil_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ -losg
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am
---- SimGear-1.9.1.orig/simgear/screen/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -35,6 +35,12 @@
- shader.cpp \
- win32-printer.h
-
-+libsgscreen_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ -lz \
-+ -lplibssg \
-+ -lGLU
-+
- if HAVE_GLUT
- noinst_PROGRAMS = TestRenderTexture
-
-diff -uNr SimGear-1.9.1.orig/simgear/serial/Makefile.am SimGear-1.9.1/simgear/serial/Makefile.am
---- SimGear-1.9.1.orig/simgear/serial/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/serial/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -6,6 +6,9 @@
-
- libsgserial_la_SOURCES = serial.cxx
-
-+libsgserial_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la
-+
- noinst_PROGRAMS = testserial
-
- testserial_SOURCES = testserial.cxx
-diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am
---- SimGear-1.9.1.orig/simgear/sound/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -16,6 +16,13 @@
- soundmgr_openal.cxx \
- xmlsound.cxx
-
-+libsgsound_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ -lalut
-+
- noinst_PROGRAMS = openal_test1 openal_test2
-
- openal_test1_SOURCES = openal_test1.cxx
-diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am
---- SimGear-1.9.1.orig/simgear/structure/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -30,5 +30,10 @@
- SGSmplhist.cxx \
- SGSmplstat.cxx
-
-+libsgstructure_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/timing/libsgtiming.la \
-+ -lz
-+
- INCLUDES = -I$(top_srcdir)
-
-diff -uNr SimGear-1.9.1.orig/simgear/timing/Makefile.am SimGear-1.9.1/simgear/timing/Makefile.am
---- SimGear-1.9.1.orig/simgear/timing/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/timing/Makefile.am 2009-08-12 09:40:02.000000000 +0200
-@@ -16,4 +16,7 @@
- timestamp.cxx \
- timezone.cxx
-
-+libsgtiming_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la
-+
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/xml/Makefile.am SimGear-1.9.1/simgear/xml/Makefile.am
---- SimGear-1.9.1.orig/simgear/xml/Makefile.am 2009-08-12 15:08:50.000000000 +0200
-+++ SimGear-1.9.1/simgear/xml/Makefile.am 2009-08-12 09:51:44.000000000 +0200
-@@ -18,4 +18,7 @@
- xmltok.h xmltok.c \
- xmltok_impl.h
-
-+libsgxml_la_LIBADD = \
-+ $(top_builddir)/simgear/structure/libsgstructure.la
-+
- INCLUDES = -I$(top_srcdir)
diff --git a/SimGear-shared.patch b/SimGear-shared.patch
deleted file mode 100644
index 6b5af16..0000000
--- a/SimGear-shared.patch
+++ /dev/null
@@ -1,681 +0,0 @@
-diff -uNr SimGear-1.9.1.orig/configure.ac SimGear-1.9.1/configure.ac
---- SimGear-1.9.1.orig/configure.ac 2009-01-25 13:03:56.000000000 +0100
-+++ SimGear-1.9.1/configure.ac 2009-08-11 14:32:11.000000000 +0200
-@@ -34,7 +34,7 @@
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_CXX
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AX_BOOST_BASE([1.34.0])
-diff -uNr SimGear-1.9.1.orig/simgear/bucket/Makefile.am SimGear-1.9.1/simgear/bucket/Makefile.am
---- SimGear-1.9.1.orig/simgear/bucket/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/bucket/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,10 +1,10 @@
- includedir = @includedir@/bucket
-
--lib_LIBRARIES = libsgbucket.a
-+lib_LTLIBRARIES = libsgbucket.la
-
- include_HEADERS = newbucket.hxx
-
--libsgbucket_a_SOURCES = newbucket.cxx
-+libsgbucket_la_SOURCES = newbucket.cxx
-
- # noinst_PROGRAMS = testbucket
-
-diff -uNr SimGear-1.9.1.orig/simgear/debug/Makefile.am SimGear-1.9.1/simgear/debug/Makefile.am
---- SimGear-1.9.1.orig/simgear/debug/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/debug/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -2,10 +2,10 @@
-
- EXTRA_DIST = logtest.cxx
-
--lib_LIBRARIES = libsgdebug.a
-+lib_LTLIBRARIES = libsgdebug.la
-
- include_HEADERS = debug_types.h logstream.hxx
-
--libsgdebug_a_SOURCES = logstream.cxx
-+libsgdebug_la_SOURCES = logstream.cxx
-
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/environment/Makefile.am SimGear-1.9.1/simgear/environment/Makefile.am
---- SimGear-1.9.1.orig/simgear/environment/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/environment/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,9 +1,9 @@
- includedir = @includedir@/environment
-
--lib_LIBRARIES = libsgenvironment.a
-+lib_LTLIBRARIES = libsgenvironment.la
-
- include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx
-
--libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
-+libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
-
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am SimGear-1.9.1/simgear/ephemeris/Makefile.am
---- SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/ephemeris/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/ephemeris
-
--lib_LIBRARIES = libsgephem.a
-+lib_LTLIBRARIES = libsgephem.la
-
- include_HEADERS = \
- celestialBody.hxx \
-@@ -16,7 +16,7 @@
- uranus.hxx \
- venus.hxx
-
--libsgephem_a_SOURCES = \
-+libsgephem_la_SOURCES = \
- celestialBody.cxx \
- ephemeris.cxx \
- jupiter.cxx \
-diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am
---- SimGear-1.9.1.orig/simgear/io/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/io
-
--lib_LIBRARIES = libsgio.a
-+lib_LTLIBRARIES = libsgio.la
-
- include_HEADERS = \
- iochannel.hxx \
-@@ -11,7 +11,7 @@
- sg_socket.hxx \
- sg_socket_udp.hxx
-
--libsgio_a_SOURCES = \
-+libsgio_la_SOURCES = \
- iochannel.cxx \
- lowlevel.cxx \
- sg_binobj.cxx \
-@@ -27,10 +27,10 @@
- tcp_server_SOURCES = tcp_server.cxx
-
- tcp_server_LDADD = \
-- libsgio.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ libsgio.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
- -lplibnet -lplibul -lz \
- $(network_LIBS) \
- $(base_LIBS)
-@@ -38,10 +38,10 @@
- tcp_client_SOURCES = tcp_client.cxx
-
- tcp_client_LDADD = \
-- libsgio.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ libsgio.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
- -lplibnet -lplibul -lz \
- $(network_LIBS) \
- $(base_LIBS)
-@@ -49,10 +49,10 @@
- socktest_SOURCES = socktest.cxx
-
- socktest_LDADD = \
-- libsgio.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ libsgio.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
- -lplibnet -lplibul -lz \
- $(network_LIBS) \
- $(base_LIBS)
-@@ -60,17 +60,17 @@
- lowtest_SOURCES = lowtest.cxx
-
- lowtest_LDADD = \
-- libsgio.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ libsgio.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
- $(base_LIBS) -lz
-
- decode_binobj_SOURCES = decode_binobj.cxx
-
- decode_binobj_LDADD = \
-- libsgio.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ libsgio.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
- $(base_LIBS) -lz
-diff -uNr SimGear-1.9.1.orig/simgear/magvar/Makefile.am SimGear-1.9.1/simgear/magvar/Makefile.am
---- SimGear-1.9.1.orig/simgear/magvar/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/magvar/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,10 +1,10 @@
- includedir = @includedir@/magvar
-
--lib_LIBRARIES = libsgmagvar.a
-+lib_LTLIBRARIES = libsgmagvar.la
-
- include_HEADERS = magvar.hxx
-
--libsgmagvar_a_SOURCES = \
-+libsgmagvar_la_SOURCES = \
- coremag.hxx coremag.cxx \
- magvar.cxx
-
-@@ -13,7 +13,7 @@
- testmagvar_SOURCES = testmagvar.cxx
-
- testmagvar_LDADD = \
-- libsgmagvar.a \
-+ libsgmagvar.la \
- $(base_LIBS)
-
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/Makefile.am SimGear-1.9.1/simgear/Makefile.am
---- SimGear-1.9.1.orig/simgear/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/Makefile.am 2009-08-11 14:33:26.000000000 +0200
-@@ -16,22 +16,22 @@
- $(compatibility_DIR) \
-- xml \
- debug \
-+ serial \
-+ nasal \
-- misc \
-+ timing \
- structure \
-+ xml \
-+ props \
-+ misc \
- bucket \
- ephemeris \
- io \
- magvar \
- math \
-- $(METAR_DIRS) \
-- nasal \
-- props \
- route \
-- scene \
- screen \
-- serial \
- sound \
-- $(SGTHREAD_DIR) \
-- timing
-+ scene \
-+ $(METAR_DIRS) \
-+ $(SGTHREAD_DIR)
-
- DIST_SUBDIRS = $(SUBDIRS) compatibility
-diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am
---- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -4,12 +4,12 @@
- TESTS = $(check_PROGRAMS)
-
- SGMathTest_SOURCES = SGMathTest.cxx
--SGMathTest_LDADD = libsgmath.a $(base_LIBS)
-+SGMathTest_LDADD = libsgmath.la $(base_LIBS)
-
- SGGeometryTest_SOURCES = SGGeometryTest.cxx
--SGGeometryTest_LDADD = libsgmath.a $(base_LIBS)
-+SGGeometryTest_LDADD = libsgmath.la $(base_LIBS)
-
--lib_LIBRARIES = libsgmath.a
-+lib_LTLIBRARIES = libsgmath.la
-
- include_HEADERS = \
- interpolater.hxx \
-@@ -44,7 +44,7 @@
- SGVec3.hxx \
- SGVec4.hxx
-
--libsgmath_a_SOURCES = \
-+libsgmath_la_SOURCES = \
- interpolater.cxx \
- leastsqs.cxx \
- sg_random.c \
-diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am
---- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-11 14:34:32.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/misc
-
--lib_LIBRARIES = libsgmisc.a
-+lib_LTLIBRARIES = libsgmisc.la
-
- include_HEADERS = \
- sg_path.hxx \
-@@ -14,7 +14,7 @@
- stdint.hxx \
- PathOptions.hxx
-
--libsgmisc_a_SOURCES = \
-+libsgmisc_la_SOURCES = \
- sg_path.cxx \
- sgstream.cxx \
- strutils.cxx \
-@@ -28,15 +28,15 @@
-
- tabbed_value_test_SOURCES = tabbed_values_test.cxx
- tabbed_value_test_LDADD = \
-- libsgmisc.a \
-- $(top_builddir)/simgear/xml/libsgxml.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a
-+ libsgmisc.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la
-
- $(top_builddir)/simgear/xml/libsgxml.a:
-- cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
-+ cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.la
-
- $(top_builddir)/simgear/debug/libsgdebug.a:
-- cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
-+ cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.la
-
- swap_test_SOURCES = swap_test.cpp
-
-diff -uNr SimGear-1.9.1.orig/simgear/nasal/Makefile.am SimGear-1.9.1/simgear/nasal/Makefile.am
---- SimGear-1.9.1.orig/simgear/nasal/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/nasal/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,10 +1,10 @@
- includedir = @includedir@/nasal
-
--lib_LIBRARIES = libsgnasal.a
-+lib_LTLIBRARIES = libsgnasal.la
-
- include_HEADERS = nasal.h naref.h
-
--libsgnasal_a_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c \
-+libsgnasal_la_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c \
- hash.c iolib.c iolib.h lex.c lib.c mathlib.c \
- misc.c naref.h nasal.h parse.c parse.h string.c \
- thread-posix.c thread-win32.c threadlib.c \
-diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am
---- SimGear-1.9.1.orig/simgear/props/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,25 +1,27 @@
- includedir = @includedir@/props
-
--lib_LIBRARIES = libsgprops.a
-+lib_LTLIBRARIES = libsgprops.la
-
- include_HEADERS = \
- condition.hxx \
- props.hxx \
- props_io.hxx
-
--libsgprops_a_SOURCES = \
-+libsgprops_la_SOURCES = \
- condition.cxx \
- props.cxx \
- props_io.cxx
-
--noinst_PROGRAMS = props_test
-
--props_test_SOURCES = props_test.cxx
--props_test_LDADD = \
-- libsgprops.a \
-- $(top_builddir)/simgear/xml/libsgxml.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a
-+# NOTE: Looped dependencies misc and props test files, commenting this one out
-+# noinst_PROGRAMS = props_test
-+
-+# props_test_SOURCES = props_test.cxx
-+# props_test_LDADD = \
-+# libsgprops.la \
-+# $(top_builddir)/simgear/xml/libsgxml.la \
-+# $(top_builddir)/simgear/misc/libsgmisc.la \
-+# $(top_builddir)/simgear/debug/libsgdebug.la \
-+# $(top_builddir)/simgear/structure/libsgstructure.la
-
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am
---- SimGear-1.9.1.orig/simgear/route/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,10 +1,10 @@
- includedir = @includedir@/route
-
--lib_LIBRARIES = libsgroute.a
-+lib_LTLIBRARIES = libsgroute.la
-
- include_HEADERS = route.hxx waypoint.hxx
-
--libsgroute_a_SOURCES = \
-+libsgroute_la_SOURCES = \
- route.cxx \
- waypoint.cxx
-
-@@ -15,21 +15,21 @@
- waytest_SOURCES = waytest.cxx
-
- waytest_LDADD = \
-- libsgroute.a \
-- $(top_builddir)/simgear/math/libsgmath.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/props/libsgprops.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a \
-- $(top_builddir)/simgear/xml/libsgxml.a \
-+ libsgroute.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
- $(base_LIBS) \
- -lz
-
- routetest_SOURCES = routetest.cxx
-
- routetest_LDADD = \
-- libsgroute.a \
-- $(top_builddir)/simgear/math/libsgmath.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a \
-+ libsgroute.la \
-+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
- $(base_LIBS)
-diff -uNr SimGear-1.9.1.orig/simgear/scene/material/Makefile.am SimGear-1.9.1/simgear/scene/material/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/material/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/material/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/material
-
--lib_LIBRARIES = libsgmaterial.a
-+lib_LTLIBRARIES = libsgmaterial.la
-
- noinst_HEADERS =
-
-@@ -9,7 +9,7 @@
- matlib.hxx \
- matmodel.hxx
-
--libsgmaterial_a_SOURCES = \
-+libsgmaterial_la_SOURCES = \
- mat.cxx \
- matlib.cxx \
- matmodel.cxx
-diff -uNr SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/model/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/model
-
--lib_LIBRARIES = libsgmodel.a
-+lib_LTLIBRARIES = libsgmodel.la
-
- noinst_HEADERS =
-
-@@ -25,7 +25,7 @@
- SGScaleTransform.hxx \
- SGTranslateTransform.hxx
-
--libsgmodel_a_SOURCES = \
-+libsgmodel_la_SOURCES = \
- animation.cxx \
- particles.cxx \
- location.cxx \
-diff -uNr SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am SimGear-1.9.1/simgear/scene/sky/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/sky/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/sky
-
--lib_LIBRARIES = libsgsky.a
-+lib_LTLIBRARIES = libsgsky.la
-
- include_HEADERS = \
- cloud.hxx \
-@@ -15,7 +15,7 @@
- newcloud.hxx \
- CloudShaderGeometry.hxx
-
--libsgsky_a_SOURCES = \
-+libsgsky_la_SOURCES = \
- cloud.cxx \
- dome.cxx \
- moon.cxx \
-diff -uNr SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.1/simgear/scene/tgdb/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/tgdb
-
--lib_LIBRARIES = libsgtgdb.a
-+lib_LTLIBRARIES = libsgtgdb.la
-
- noinst_HEADERS =
-
-@@ -24,7 +24,7 @@
- TileCache.hxx \
- TileEntry.hxx
-
--libsgtgdb_a_SOURCES = \
-+libsgtgdb_la_SOURCES = \
- apt_signs.cxx \
- obj.cxx \
- pt_lights.cxx \
-diff -uNr SimGear-1.9.1.orig/simgear/scene/util/Makefile.am SimGear-1.9.1/simgear/scene/util/Makefile.am
---- SimGear-1.9.1.orig/simgear/scene/util/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/util/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/util
-
--lib_LIBRARIES = libsgutil.a
-+lib_LTLIBRARIES = libsgutil.la
-
- noinst_HEADERS =
-
-@@ -21,7 +21,7 @@
- VectorArrayAdapter.hxx
-
-
--libsgutil_a_SOURCES = \
-+libsgutil_la_SOURCES = \
- SGEnlargeBoundingBox.cxx \
- SGSceneFeatures.cxx \
- SGSceneUserData.cxx \
-diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am
---- SimGear-1.9.1.orig/simgear/screen/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/screen
-
--lib_LIBRARIES = libsgscreen.a
-+lib_LTLIBRARIES = libsgscreen.la
-
- EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
-
-@@ -24,7 +24,7 @@
- shader.h \
- tr.h
-
--libsgscreen_a_SOURCES = \
-+libsgscreen_la_SOURCES = \
- texture.cxx \
- GLBitmaps.cxx \
- $(IMAGE_SERVER_SRCS) \
-@@ -41,8 +41,8 @@
- TestRenderTexture_SOURCES = TestRenderTexture.cpp
-
- TestRenderTexture_LDADD = \
-- libsgscreen.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-+ libsgscreen.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
- $(opengl_LIBS)
- endif
-
-diff -uNr SimGear-1.9.1.orig/simgear/serial/Makefile.am SimGear-1.9.1/simgear/serial/Makefile.am
---- SimGear-1.9.1.orig/simgear/serial/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/serial/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,17 +1,17 @@
- includedir = @includedir@/serial
-
--lib_LIBRARIES = libsgserial.a
-+lib_LTLIBRARIES = libsgserial.la
-
- include_HEADERS = serial.hxx
-
--libsgserial_a_SOURCES = serial.cxx
-+libsgserial_la_SOURCES = serial.cxx
-
- noinst_PROGRAMS = testserial
-
- testserial_SOURCES = testserial.cxx
-
- testserial_LDADD = \
-- libsgserial.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a
-+ libsgserial.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la
-
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am
---- SimGear-1.9.1.orig/simgear/sound/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -2,7 +2,7 @@
-
- EXTRA_DIST = jet.wav
-
--lib_LIBRARIES = libsgsound.a
-+lib_LTLIBRARIES = libsgsound.la
-
- noinst_HEADERS =
-
-@@ -11,7 +11,7 @@
- soundmgr_openal.hxx \
- xmlsound.hxx
-
--libsgsound_a_SOURCES = \
-+libsgsound_la_SOURCES = \
- sample_openal.cxx \
- soundmgr_openal.cxx \
- xmlsound.cxx
-@@ -22,14 +22,14 @@
- openal_test2_SOURCES = openal_test2.cxx
-
- openal_test1_LDADD = \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
- $(openal_LIBS)
-
- openal_test2_LDADD = \
-- libsgsound.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a \
-+ libsgsound.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
- $(openal_LIBS)
-
- INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"
-diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am
---- SimGear-1.9.1.orig/simgear/structure/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/structure
-
--lib_LIBRARIES = libsgstructure.a
-+lib_LTLIBRARIES = libsgstructure.la
-
- include_HEADERS = \
- callback.hxx \
-@@ -19,7 +19,7 @@
- SGSmplstat.hxx \
- Singleton.hxx
-
--libsgstructure_a_SOURCES = \
-+libsgstructure_la_SOURCES = \
- commands.cxx \
- exception.cxx \
- event_mgr.cxx\
-diff -uNr SimGear-1.9.1.orig/simgear/threads/Makefile.am SimGear-1.9.1/simgear/threads/Makefile.am
---- SimGear-1.9.1.orig/simgear/threads/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/threads/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,13 +1,13 @@
- includedir = @includedir@/threads
-
--lib_LIBRARIES = libsgthreads.a
-+lib_LTLIBRARIES = libsgthreads.la
-
- include_HEADERS = \
- SGGuard.hxx \
- SGQueue.hxx \
- SGThread.hxx
-
--libsgthreads_a_SOURCES = \
-+libsgthreads_la_SOURCES = \
- SGThread.cxx
-
- INCLUDES = -I$(top_srcdir)
-diff -uNr SimGear-1.9.1.orig/simgear/timing/Makefile.am SimGear-1.9.1/simgear/timing/Makefile.am
---- SimGear-1.9.1.orig/simgear/timing/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/timing/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/timing
-
--lib_LIBRARIES = libsgtiming.a
-+lib_LTLIBRARIES = libsgtiming.la
-
- include_HEADERS = \
- geocoord.h \
-@@ -9,7 +9,7 @@
- timestamp.hxx \
- timezone.h
-
--libsgtiming_a_SOURCES = \
-+libsgtiming_la_SOURCES = \
- geocoord.cxx \
- lowleveltime.cxx \
- sg_time.cxx \
-diff -uNr SimGear-1.9.1.orig/simgear/xml/Makefile.am SimGear-1.9.1/simgear/xml/Makefile.am
---- SimGear-1.9.1.orig/simgear/xml/Makefile.am 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/xml/Makefile.am 2009-08-11 14:32:11.000000000 +0200
-@@ -1,6 +1,6 @@
- includedir = @includedir@/xml
-
--lib_LIBRARIES = libsgxml.a
-+lib_LTLIBRARIES = libsgxml.la
-
- include_HEADERS = \
- easyxml.hxx
-@@ -8,7 +8,7 @@
- noinst_HEADERS = \
- xmltok_impl.c xmltok_ns.c
-
--libsgxml_a_SOURCES = \
-+libsgxml_la_SOURCES = \
- asciitab.h \
- easyxml.cxx \
- hashtable.h hashtable.c \
diff --git a/SimGear-tgdb.patch b/SimGear-tgdb.patch
deleted file mode 100644
index b9df2a0..0000000
--- a/SimGear-tgdb.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SimGear-1.9.1/simgear/scene/tgdb/Makefile.am~ 2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am 2009-07-01 12:39:03.000000000 +0200
-@@ -14,7 +14,6 @@
- SGVasiDrawable.hxx \
- SGDirectionalLightBin.hxx \
- SGLightBin.hxx \
-- SGOceanTile.hxx \
- SGReaderWriterBTGOptions.hxx \
- SGTexturedTriangleBin.hxx \
- SGTriangleBin.hxx \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SimGear.git/commitdiff/80e1d6f29d80c6cedef3f773b4878b4edf994039
More information about the pld-cvs-commit
mailing list