rpms/SimGear/FC-6 SimGear-0.3.10-shared-auto.patch, NONE, 1.1 SimGear-0.3.10-thesky.patch, NONE, 1.1 SimGear-0.3.10-untangle.patch, NONE, 1.1 SimGear-0.3.10-shared.patch, 1.1, 1.2 SimGear.spec, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Mar 30 15:22:29 UTC 2007
- Previous message (by thread): rpms/SimGear/devel SimGear-0.3.10-shared-auto.patch, NONE, 1.1 SimGear-0.3.10-thesky.patch, NONE, 1.1 SimGear-0.3.10-untangle.patch, NONE, 1.1 SimGear-0.3.10-shared.patch, 1.1, 1.2 SimGear.spec, 1.1, 1.2
- Next message (by thread): rpms/perl-Contextual-Return/FC-5 perl-Contextual-Return.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/SimGear/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17706
Modified Files:
SimGear-0.3.10-shared.patch SimGear.spec
Added Files:
SimGear-0.3.10-shared-auto.patch SimGear-0.3.10-thesky.patch
SimGear-0.3.10-untangle.patch
Log Message:
* Fri Mar 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.10-4
- link with -release %{version} libtool flag instead of -version, so that we
get unique soname's for each upstream release. (Upstream gives 0 ABI
guarantees)
- fix many undefined-non-weak-symbol's, some still remain though, see bz 208678
- work around the "thesky" bug, see bz 208678
SimGear-0.3.10-shared-auto.patch:
--- NEW FILE SimGear-0.3.10-shared-auto.patch ---
diff -urN SimGear-0.3.10.orig/INSTALL SimGear-0.3.10/INSTALL
--- SimGear-0.3.10.orig/INSTALL 2004-09-29 07:15:05.000000000 +0200
+++ SimGear-0.3.10/INSTALL 2007-03-30 17:00:58.000000000 +0200
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,31 +87,29 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +157,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -189,9 +187,14 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
`configure' Invocation
======================
diff -urN SimGear-0.3.10.orig/Makefile.in SimGear-0.3.10/Makefile.in
--- SimGear-0.3.10.orig/Makefile.in 2006-04-05 20:25:02.000000000 +0200
+++ SimGear-0.3.10/Makefile.in 2007-03-30 17:00:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,18 +31,19 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/SimGear.spec.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- TODO config.guess config.sub depcomp install-sh missing
-subdir = .
+ TODO config.guess config.sub depcomp install-sh ltmain.sh \
+ missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/simgear/simgear_config.h
CONFIG_CLEAN_FILES = SimGear.spec
@@ -54,10 +51,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
[...128558 lines suppressed...]
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/easyxml.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hashtable.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+.c.lo:
+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
.cxx.o:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cxx.obj:
- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
+
+.cxx.lo:
+ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -385,22 +419,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -413,10 +446,10 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -444,7 +477,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -464,12 +498,20 @@
install-data-am: install-includeHEADERS
-install-exec-am: install-libLIBRARIES
+install-dvi: install-dvi-am
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -479,7 +521,8 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
pdf: pdf-am
@@ -489,21 +532,24 @@
ps-am:
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLIBRARIES
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-libLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-includeHEADERS install-info \
+ install-info-am install-libLTLIBRARIES install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLIBRARIES
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-includeHEADERS \
+ uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
SimGear-0.3.10-thesky.patch:
--- NEW FILE SimGear-0.3.10-thesky.patch ---
--- SimGear-0.3.10/simgear/scene/sky/sky.cxx~ 2007-03-30 12:08:35.000000000 +0200
+++ SimGear-0.3.10/simgear/scene/sky/sky.cxx 2007-03-30 12:08:36.000000000 +0200
@@ -33,6 +33,8 @@
#include "sky.hxx"
#include "cloudfield.hxx"
+SGSky *thesky = NULL;
+
// Constructor
SGSky::SGSky( void ) {
effective_visibility = visibility = 10000.0;
@@ -47,6 +49,9 @@
// ramp_down = 4.0;
in_cloud = -1;
+
+ if (thesky == NULL)
+ thesky = this;
}
@@ -55,6 +60,9 @@
{
for (unsigned int i = 0; i < cloud_layers.size(); i++)
delete cloud_layers[i];
+
+ if (this == thesky)
+ thesky = NULL;
}
SimGear-0.3.10-untangle.patch:
--- NEW FILE SimGear-0.3.10-untangle.patch ---
diff -ur SimGear-0.3.10/simgear/misc/sg_path.cxx SimGear-0.3.10.new/simgear/misc/sg_path.cxx
--- SimGear-0.3.10/simgear/misc/sg_path.cxx 2006-03-09 23:34:48.000000000 +0100
+++ SimGear-0.3.10.new/simgear/misc/sg_path.cxx 2007-03-30 16:09:32.000000000 +0200
@@ -36,17 +36,9 @@
/**
- * define directory path separators
+ * define directory search path separators
*/
-#if defined( macintosh )
-static const char sgDirPathSep = ':';
-static const char sgDirPathSepBad = '/';
-#else
-static const char sgDirPathSep = '/';
-static const char sgDirPathSepBad = '\\';
-#endif
-
#if defined( WIN32 ) && !defined(__CYGWIN__)
static const char sgSearchPathSep = ';';
#else
@@ -54,28 +46,6 @@
#endif
-// If Unix, replace all ":" with "/". If MacOS, replace all "/" with
-// ":" it should go without saying that neither of these characters
-// should be used in file or directory names. In windoze, allow the
-// second character to be a ":" for things like c:\foo\bar
-
-void
-SGPath::fix()
-{
- for ( string::size_type i = 0; i < path.size(); ++i ) {
-#if defined( WIN32 )
- // for windoze, don't replace the ":" for the second character
- if ( i == 1 ) {
- continue;
- }
-#endif
- if ( path[i] == sgDirPathSepBad ) {
- path[i] = sgDirPathSep;
- }
- }
-}
-
-
// default constructor
SGPath::SGPath()
: path("")
@@ -83,19 +53,6 @@
}
-// create a path based on "path"
-SGPath::SGPath( const std::string& p )
- : path(p)
-{
- fix();
-}
-
-
-// destructor
-SGPath::~SGPath() {
-}
-
-
// set path
void SGPath::set( const string& p ) {
path = p;
@@ -103,19 +60,6 @@
}
-// append another piece to the existing path
-void SGPath::append( const string& p ) {
- if ( path.size() == 0 ) {
- path = p;
- } else {
- if ( p[0] != sgDirPathSep ) {
- path += sgDirPathSep;
- }
- path += p;
- }
- fix();
-}
-
//add a new path component to the existing path string
void SGPath::add( const string& p ) {
append( sgSearchPathSep+p );
@@ -136,7 +80,7 @@
// Get the file part of the path (everything after the last path sep)
string SGPath::file() const {
- int index = path.rfind(sgDirPathSep);
+ int index = path.rfind(SGPATH_sgDirPathSep);
if (index >= 0) {
return path.substr(index + 1);
} else {
@@ -145,16 +89,6 @@
}
-// get the directory part of the path.
-string SGPath::dir() const {
- int index = path.rfind(sgDirPathSep);
- if (index >= 0) {
- return path.substr(0, index);
- } else {
- return "";
- }
-}
-
// get the base part of the path (everything but the extension.)
string SGPath::base() const {
int index = path.rfind(".");
@@ -197,10 +131,10 @@
string_list dirlist = sgPathSplit(dir());
string path = dirlist[0];
string_list path_elements = sgPathBranchSplit(path);
- bool absolute = !path.empty() && path[0] == sgDirPathSep;
+ bool absolute = !path.empty() && path[0] == SGPATH_sgDirPathSep;
unsigned int i = 1;
- SGPath dir = absolute ? string( 1, sgDirPathSep ) : "";
+ SGPath dir = absolute ? string( 1, SGPATH_sgDirPathSep ) : "";
dir.concat( path_elements[0] );
#if defined( _MSC_VER) || defined(__MINGW32__)
if ( dir.str().find(':') != string::npos && path_elements.size() >= 2 ) {
@@ -233,7 +167,7 @@
string_list path_elements;
string element, path = dirpath;
while ( path.size() ) {
- size_t p = path.find( sgDirPathSep );
+ size_t p = path.find( SGPATH_sgDirPathSep );
if ( p != string::npos ) {
element = path.substr( 0, p );
path.erase( 0, p + 1 );
diff -ur SimGear-0.3.10/simgear/misc/sg_path.hxx SimGear-0.3.10.new/simgear/misc/sg_path.hxx
--- SimGear-0.3.10/simgear/misc/sg_path.hxx 2006-03-09 23:34:48.000000000 +0100
+++ SimGear-0.3.10.new/simgear/misc/sg_path.hxx 2007-03-30 16:11:08.000000000 +0200
@@ -49,6 +49,18 @@
* automatically to the proper format.
*/
+/**
+ * define directory path separators
+ */
+
+#if defined( macintosh )
+#define SGPATH_sgDirPathSep ':'
+#define SGPATH_sgDirPathSepBad '/'
+#else
+#define SGPATH_sgDirPathSep '/'
+#define SGPATH_sgDirPathSepBad '\\'
+#endif
+
class SGPath {
private:
@@ -64,10 +76,13 @@
* Construct a path based on the starting path provided.
* @param p initial path
*/
- SGPath( const string& p );
+ SGPath( const string& p ) : path(p)
+ {
+ fix();
+ }
/** Destructor */
- ~SGPath();
+ ~SGPath() {}
/**
* Set path to a new value
@@ -80,7 +95,17 @@
* Append another piece to the existing path. Inserts a path
* separator between the existing component and the new component.
* @param p additional path component */
- void append( const string& p );
+ void append( const string& p ) {
+ if ( path.size() == 0 ) {
+ path = p;
+ } else {
+ if ( p[0] != SGPATH_sgDirPathSep ) {
+ path += SGPATH_sgDirPathSep;
+ }
+ path += p;
+ }
+ fix();
+ }
/**
* Append a new piece to the existing path. Inserts a search path
@@ -105,7 +130,14 @@
* Get the directory part of the path.
* @return directory string
*/
- string dir() const;
+ string dir() const {
+ int index = path.rfind(SGPATH_sgDirPathSep);
+ if (index >= 0) {
+ return path.substr(0, index);
+ } else {
+ return "";
+ }
+ }
/**
* Get the base part of the path (everything but the extension.)
@@ -144,7 +176,25 @@
private:
- void fix();
+ // If Unix, replace all ":" with "/". If MacOS, replace all "/" with
+ // ":" it should go without saying that neither of these characters
+ // should be used in file or directory names. In windoze, allow the
+ // second character to be a ":" for things like c:\foo\bar
+
+ void fix()
+ {
+ for ( string::size_type i = 0; i < path.size(); ++i ) {
+ #if defined( WIN32 )
+ // for windoze, don't replace the ":" for the second character
+ if ( i == 1 ) {
+ continue;
+ }
+ #endif
+ if ( path[i] == SGPATH_sgDirPathSepBad ) {
+ path[i] = SGPATH_sgDirPathSep;
+ }
+ }
+ }
};
diff -ur SimGear-0.3.10/simgear/props/props.cxx SimGear-0.3.10.new/simgear/props/props.cxx
--- SimGear-0.3.10/simgear/props/props.cxx 2006-03-15 16:15:39.000000000 +0100
+++ SimGear-0.3.10.new/simgear/props/props.cxx 2007-03-30 16:35:36.000000000 +0200
@@ -317,60 +317,6 @@
////////////////////////////////////////////////////////////////////////
inline bool
-SGPropertyNode::get_bool () const
-{
- if (_tied)
- return _value.bool_val->getValue();
- else
- return _local_val.bool_val;
-}
-
-inline int
-SGPropertyNode::get_int () const
-{
- if (_tied)
- return _value.int_val->getValue();
- else
- return _local_val.int_val;
-}
-
-inline long
-SGPropertyNode::get_long () const
-{
- if (_tied)
- return _value.long_val->getValue();
- else
- return _local_val.long_val;
-}
-
-inline float
-SGPropertyNode::get_float () const
-{
- if (_tied)
- return _value.float_val->getValue();
- else
- return _local_val.float_val;
-}
-
-inline double
-SGPropertyNode::get_double () const
-{
- if (_tied)
- return _value.double_val->getValue();
- else
- return _local_val.double_val;
-}
-
-inline const char *
-SGPropertyNode::get_string () const
-{
- if (_tied)
- return _value.string_val->getValue();
- else
- return _local_val.string_val;
-}
-
-inline bool
SGPropertyNode::set_bool (bool val)
{
if (_tied) {
@@ -1129,40 +1075,6 @@
}
}
-double
-SGPropertyNode::getDoubleValue () const
-{
- // Shortcut for common case
- if (_attr == (READ|WRITE) && _type == DOUBLE)
- return get_double();
-
- if (getAttribute(TRACE_READ))
- trace_read();
- if (!getAttribute(READ))
- return SGRawValue<double>::DefaultValue;
-
- switch (_type) {
- case ALIAS:
- return _value.alias->getDoubleValue();
- case BOOL:
- return double(get_bool());
- case INT:
- return double(get_int());
- case LONG:
- return double(get_long());
- case FLOAT:
- return double(get_float());
- case DOUBLE:
- return get_double();
- case STRING:
- case UNSPECIFIED:
- return strtod(get_string(), 0);
- case NONE:
- default:
- return SGRawValue<double>::DefaultValue;
- }
-}
-
const char *
SGPropertyNode::getStringValue () const
{
Only in SimGear-0.3.10.new/simgear/props: props.cxx~
diff -ur SimGear-0.3.10/simgear/props/props.hxx SimGear-0.3.10.new/simgear/props/props.hxx
--- SimGear-0.3.10/simgear/props/props.hxx 2006-03-15 16:15:39.000000000 +0100
+++ SimGear-0.3.10.new/simgear/props/props.hxx 2007-03-30 16:42:21.000000000 +0200
@@ -835,7 +835,40 @@
/**
* Get a double value for this node.
*/
- double getDoubleValue () const;
+ double getDoubleValue () const
+ {
+ // Shortcut for common case
+ if (_attr == (READ|WRITE) && _type == DOUBLE)
+ return get_double();
+
+ /* Commented to make getDoubleValue() independend if props.obj as
+ getDoubleValue() gets used by structure */
+ /* if (getAttribute(TRACE_READ))
+ trace_read(); */
+ if (!getAttribute(READ))
+ return 0.0L; /* SGRawValue<double>::DefaultValue */
+
+ switch (_type) {
+ case ALIAS:
+ return _value.alias->getDoubleValue();
+ case BOOL:
+ return double(get_bool());
+ case INT:
+ return double(get_int());
+ case LONG:
+ return double(get_long());
+ case FLOAT:
+ return double(get_float());
+ case DOUBLE:
+ return get_double();
+ case STRING:
+ case UNSPECIFIED:
+ return strtod(get_string(), 0);
+ case NONE:
+ default:
+ return 0.0L; /* SGRawValue<double>::DefaultValue */
+ }
+ }
/**
@@ -1149,12 +1182,54 @@
private:
// Get the raw value
- bool get_bool () const;
- int get_int () const;
- long get_long () const;
- float get_float () const;
- double get_double () const;
- const char * get_string () const;
+ inline bool get_bool () const
+ {
+ if (_tied)
+ return _value.bool_val->getValue();
+ else
+ return _local_val.bool_val;
+ }
+
+ inline int get_int () const
+ {
+ if (_tied)
+ return _value.int_val->getValue();
+ else
+ return _local_val.int_val;
+ }
+
+ inline long get_long () const
+ {
+ if (_tied)
+ return _value.long_val->getValue();
+ else
+ return _local_val.long_val;
+ }
+
+ inline float get_float () const
+ {
+ if (_tied)
+ return _value.float_val->getValue();
+ else
+ return _local_val.float_val;
+ }
+
+ inline double get_double () const
+ {
+ if (_tied)
+ return _value.double_val->getValue();
+ else
+ return _local_val.double_val;
+ }
+
+ inline const char * get_string () const
+ {
+ if (_tied)
+ return _value.string_val->getValue();
+ else
+ return _local_val.string_val;
+ }
+
// Set the raw value
bool set_bool (bool value);
SimGear-0.3.10-shared.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 SimGear-0.3.10-shared.patch
Index: SimGear-0.3.10-shared.patch
===================================================================
RCS file: /cvs/extras/rpms/SimGear/FC-6/SimGear-0.3.10-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimGear-0.3.10-shared.patch 28 Mar 2007 13:42:38 -0000 1.1
+++ SimGear-0.3.10-shared.patch 30 Mar 2007 15:14:57 -0000 1.2
@@ -1,95 +1,45 @@
---- SimGear-0.3.10/simgear/io/Makefile.am.orig 2006-10-03 14:59:53.000000000 -0500
-+++ SimGear-0.3.10/simgear/io/Makefile.am 2006-10-03 15:00:18.000000000 -0500
-@@ -1,6 +1,6 @@
- includedir = @includedir@/io
-
--lib_LIBRARIES = libsgio.a
-+lib_LTLIBRARIES = libsgio.la
-
- include_HEADERS = \
- iochannel.hxx \
-@@ -11,7 +11,7 @@ include_HEADERS = \
- sg_socket.hxx \
- sg_socket_udp.hxx
-
--libsgio_a_SOURCES = \
-+libsgio_la_SOURCES = \
- iochannel.cxx \
- lowlevel.cxx \
- sg_binobj.cxx \
-@@ -22,6 +22,8 @@ libsgio_a_SOURCES = \
-
- INCLUDES = -I$(top_srcdir)
-
-+libsgio_la_LDFLAGS = -version-info 1:0:0 -module
-+
- noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
-
- tcp_server_SOURCES = tcp_server.cxx
---- SimGear-0.3.10/simgear/route/Makefile.am.orig 2006-10-03 15:07:01.000000000 -0500
-+++ SimGear-0.3.10/simgear/route/Makefile.am 2006-10-03 15:07:18.000000000 -0500
-@@ -1,13 +1,15 @@
- 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
-
-+libsgroute_la_LDFLAGS = -version-info 1:0:0 -module
-+
- INCLUDES = -I$(top_srcdir)
-
- noinst_PROGRAMS = waytest routetest
---- SimGear-0.3.10/simgear/debug/Makefile.am.orig 2006-10-03 14:56:59.000000000 -0500
-+++ SimGear-0.3.10/simgear/debug/Makefile.am 2006-10-03 14:57:45.000000000 -0500
-@@ -2,10 +2,11 @@ includedir = @includedir@/debug
+--- SimGear-0.3.10/configure.ac.hdg 2007-03-29 22:01:40.000000000 +0200
++++ SimGear-0.3.10/configure.ac 2007-03-29 22:02:04.000000000 +0200
+@@ -3,6 +3,7 @@
- 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
-+libsgdebug_la_LDFLAGS = -version-info 1:0:0 -module
+ AC_INIT
+ AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
++AC_PROG_LIBTOOL
- INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10/simgear/scene/model/Makefile.am.orig 2006-10-03 15:08:25.000000000 -0500
-+++ SimGear-0.3.10/simgear/scene/model/Makefile.am 2006-10-03 15:08:54.000000000 -0500
+ dnl Require at least automake 2.52
+ AC_PREREQ(2.52)
+--- SimGear-0.3.10/simgear/scene/material/Makefile.am.hdg 2007-03-29 22:01:26.000000000 +0200
++++ SimGear-0.3.10/simgear/scene/material/Makefile.am 2007-03-29 22:02:03.000000000 +0200
@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/model
+ includedir = @includedir@/scene/material
--lib_LIBRARIES = libsgmodel.a
-+lib_LTLIBRARIES = libsgmodel.la
+-lib_LIBRARIES = libsgmaterial.a
++lib_LTLIBRARIES = libsgmaterial.la
noinst_HEADERS =
-@@ -15,7 +15,7 @@ include_HEADERS = \
- placementtrans.hxx \
- shadowvolume.hxx
+@@ -9,9 +9,18 @@
+ matlib.hxx \
+ matmodel.hxx
--libsgmodel_a_SOURCES = \
-+libsgmodel_la_SOURCES = \
- animation.cxx \
- custtrans.cxx \
- location.cxx \
-@@ -27,4 +27,6 @@ libsgmodel_a_SOURCES = \
- shadowvolume.cxx \
- shadanim.cxx
+-libsgmaterial_a_SOURCES = \
++libsgmaterial_la_SOURCES = \
+ mat.cxx \
+ matlib.cxx \
+ matmodel.cxx
-+libsgmodel_la_LDFLAGS = -version-info 1:0:0 -module
++libsgmaterial_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lGL
++
++libsgmaterial_la_LIBADD = \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
++ $(top_builddir)/simgear/structure/libsgstructure.la \
++ $(top_builddir)/simgear/props/libsgprops.la \
++ $(top_builddir)/simgear/math/libsgmath.la
+
INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10/simgear/scene/sky/Makefile.am.orig 2006-10-03 15:09:07.000000000 -0500
-+++ SimGear-0.3.10/simgear/scene/sky/Makefile.am 2006-10-03 15:09:43.000000000 -0500
+--- SimGear-0.3.10/simgear/scene/sky/Makefile.am.hdg 2007-03-29 22:01:26.000000000 +0200
++++ SimGear-0.3.10/simgear/scene/sky/Makefile.am 2007-03-29 22:02:03.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/scene/sky
@@ -98,7 +48,7 @@
include_HEADERS = \
cloud.hxx \
-@@ -14,7 +14,7 @@ include_HEADERS = \
+@@ -14,7 +14,7 @@
cloudfield.hxx \
newcloud.hxx
@@ -107,15 +57,23 @@
cloud.cxx \
dome.cxx \
moon.cxx \
-@@ -26,4 +26,6 @@ libsgsky_a_SOURCES = \
+@@ -26,4 +26,14 @@
cloudfield.cxx \
newcloud.cxx
-+libsgsky_la_LDFLAGS = -version-info 1:0:0 -module
++libsgsky_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibul -lplibsg \
++ -lGL -lGLU
++
++libsgsky_la_LIBADD = \
++ $(top_builddir)/simgear/screen/libsgscreen.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
++ $(top_builddir)/simgear/props/libsgprops.la \
++ $(top_builddir)/simgear/math/libsgmath.la
+
INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10/simgear/scene/tgdb/Makefile.am.orig 2006-10-03 15:09:54.000000000 -0500
-+++ SimGear-0.3.10/simgear/scene/tgdb/Makefile.am 2006-10-03 15:10:30.000000000 -0500
+--- SimGear-0.3.10/simgear/scene/tgdb/Makefile.am.hdg 2007-03-29 22:01:26.000000000 +0200
++++ SimGear-0.3.10/simgear/scene/tgdb/Makefile.am 2007-03-29 22:02:03.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/scene/tgdb
@@ -124,7 +82,7 @@
noinst_HEADERS =
-@@ -12,11 +12,13 @@ include_HEADERS = \
+@@ -12,11 +12,20 @@
userdata.hxx \
vasi.hxx
@@ -136,172 +94,85 @@
pt_lights.cxx \
userdata.cxx
-+libsgtgdb_la_LDFLAGS = -version-info 1:0:0 -module
++libsgtgdb_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibul -lGL
++
++libsgtgdb_la_LIBADD = \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/bucket/libsgbucket.la \
++ $(top_builddir)/simgear/io/libsgio.la \
++ $(top_builddir)/simgear/scene/material/libsgmaterial.la
++ $(top_builddir)/simgear/math/libsgmath.la
+
INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10/simgear/scene/material/Makefile.am.orig 2006-10-03 15:07:46.000000000 -0500
-+++ SimGear-0.3.10/simgear/scene/material/Makefile.am 2006-10-03 15:08:16.000000000 -0500
+--- SimGear-0.3.10/simgear/scene/model/Makefile.am.hdg 2007-03-29 22:01:26.000000000 +0200
++++ SimGear-0.3.10/simgear/scene/model/Makefile.am 2007-03-29 22:02:03.000000000 +0200
[...77170 lines suppressed...]
++
++libsgroute_la_LIBADD = \
++ $(top_builddir)/simgear/math/libsgmath.la
++
INCLUDES = -I$(top_srcdir)
+
+ noinst_PROGRAMS = waytest routetest
+
waytest_SOURCES = waytest.cxx
+
-waytest_LDADD = \
- $(top_builddir)/simgear/route/libsgroute.a \
- $(top_builddir)/simgear/math/libsgmath.a \
@@ -76848,6 +836,7 @@
-lz
routetest_SOURCES = routetest.cxx
+
-routetest_LDADD = \
- $(top_builddir)/simgear/route/libsgroute.a \
- $(top_builddir)/simgear/math/libsgmath.a \
@@ -76862,161 +851,27 @@
+ $(top_builddir)/simgear/props/libsgprops.la \
+ $(top_builddir)/simgear/xml/libsgxml.la \
+ $(base_LIBS) -lz
++
+--- SimGear-0.3.10/simgear/environment/Makefile.am.hdg 2007-03-29 22:01:26.000000000 +0200
++++ SimGear-0.3.10/simgear/environment/Makefile.am 2007-03-29 22:02:03.000000000 +0200
+@@ -1,9 +1,18 @@
+ includedir = @includedir@/environment
- all: all-am
-
-diff -urp SimGear-0.3.10.SHARED/simgear/screen/Makefile.in SimGear-0.3.10/simgear/screen/Makefile.in
---- SimGear-0.3.10.SHARED/simgear/screen/Makefile.in 2006-10-04 08:56:56.000000000 -0500
-+++ SimGear-0.3.10/simgear/screen/Makefile.in 2006-10-04 08:57:48.000000000 -0500
-@@ -72,11 +72,7 @@ am__TestRenderTexture_SOURCES_DIST = Tes
- @HAVE_GLUT_TRUE at am_TestRenderTexture_OBJECTS = \
- @HAVE_GLUT_TRUE@ TestRenderTexture.$(OBJEXT)
- TestRenderTexture_OBJECTS = $(am_TestRenderTexture_OBJECTS)
--am__DEPENDENCIES_1 =
-- at HAVE_GLUT_TRUE@TestRenderTexture_DEPENDENCIES = \
-- at HAVE_GLUT_TRUE@ $(top_builddir)/simgear/screen/libsgscreen.a \
-- at HAVE_GLUT_TRUE@ $(top_builddir)/simgear/debug/libsgdebug.a \
-- at HAVE_GLUT_TRUE@ $(am__DEPENDENCIES_1)
-+TestRenderTexture_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -253,10 +249,10 @@ libsgscreen_la_SOURCES = \
-
- libsgscreen_la_LDFLAGS = -version-info 1:0:0 -module
- @HAVE_GLUT_TRUE at TestRenderTexture_SOURCES = TestRenderTexture.cpp
-- at HAVE_GLUT_TRUE@TestRenderTexture_LDADD = \
-- at HAVE_GLUT_TRUE@ $(top_builddir)/simgear/screen/libsgscreen.a \
-- at HAVE_GLUT_TRUE@ $(top_builddir)/simgear/debug/libsgdebug.a \
-- at HAVE_GLUT_TRUE@ $(opengl_LIBS)
-+ at HAVE_GLUT_TRUE@TestRenderTexture_LDFLAGS = \
-+ at HAVE_GLUT_TRUE@ $(top_builddir)/simgear/screen/libsgscreen.la \
-+ at HAVE_GLUT_TRUE@ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ at HAVE_GLUT_TRUE@ $(opengl_LIBS) -lz -lplibssg
-
- INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
- all: all-am
-diff -urp SimGear-0.3.10.SHARED/simgear/serial/Makefile.in SimGear-0.3.10/simgear/serial/Makefile.in
---- SimGear-0.3.10.SHARED/simgear/serial/Makefile.in 2006-10-04 08:56:56.000000000 -0500
-+++ SimGear-0.3.10/simgear/serial/Makefile.in 2006-10-04 08:57:49.000000000 -0500
-@@ -65,9 +65,7 @@ libsgserial_la_OBJECTS = $(am_libsgseria
- PROGRAMS = $(noinst_PROGRAMS)
- am_testserial_OBJECTS = testserial.$(OBJEXT)
- testserial_OBJECTS = $(am_testserial_OBJECTS)
--testserial_DEPENDENCIES = \
-- $(top_builddir)/simgear/serial/libsgserial.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a
-+testserial_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -208,9 +206,9 @@ include_HEADERS = serial.hxx
- libsgserial_la_SOURCES = serial.cxx
- libsgserial_la_LDFLAGS = -version-info 1:0:0 -module
- testserial_SOURCES = testserial.cxx
--testserial_LDADD = \
-- $(top_builddir)/simgear/serial/libsgserial.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a
-+testserial_LDFLAGS = \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la
+-lib_LIBRARIES = libsgenvironment.a
++lib_LTLIBRARIES = libsgenvironment.la
- INCLUDES = -I$(top_srcdir)
- all: all-am
-diff -urp SimGear-0.3.10.SHARED/simgear/sound/Makefile.in SimGear-0.3.10/simgear/sound/Makefile.in
---- SimGear-0.3.10.SHARED/simgear/sound/Makefile.in 2006-10-04 08:56:56.000000000 -0500
-+++ SimGear-0.3.10/simgear/sound/Makefile.in 2006-10-04 08:57:49.000000000 -0500
-@@ -66,18 +66,10 @@ libsgsound_la_OBJECTS = $(am_libsgsound_
- PROGRAMS = $(noinst_PROGRAMS)
- am_openal_test1_OBJECTS = openal_test1.$(OBJEXT)
- openal_test1_OBJECTS = $(am_openal_test1_OBJECTS)
--am__DEPENDENCIES_1 =
--openal_test1_DEPENDENCIES = \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(am__DEPENDENCIES_1)
-+openal_test1_LDADD = $(LDADD)
- am_openal_test2_OBJECTS = openal_test2.$(OBJEXT)
- openal_test2_OBJECTS = $(am_openal_test2_OBJECTS)
--openal_test2_DEPENDENCIES = \
-- $(top_builddir)/simgear/sound/libsgsound.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a \
-- $(am__DEPENDENCIES_1)
-+openal_test2_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -231,16 +223,18 @@ libsgsound_la_SOURCES = \
- libsgsound_la_LDFLAGS = -version-info 1:0:0 -module
- openal_test1_SOURCES = openal_test1.cxx
- openal_test2_SOURCES = openal_test2.cxx
--openal_test1_LDADD = \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-+openal_test1_LDFLAGS = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
- $(openal_LIBS)
+ include_HEADERS = metar.hxx visual_enviro.hxx
--openal_test2_LDADD = \
-- $(top_builddir)/simgear/sound/libsgsound.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a \
-- $(openal_LIBS)
-+openal_test2_LDFLAGS = \
-+ $(top_builddir)/simgear/sound/libsgsound.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
+-libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx
++libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx
++libsgenvironment_la_LDFLAGS = -release @VERSION@ -module -lGL -lGLU -lplibssg
++libsgenvironment_la_LIBADD = \
+ $(top_builddir)/simgear/structure/libsgstructure.la \
+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(openal_LIBS) -lz
++ $(top_builddir)/simgear/misc/libsgmisc.la \
++ $(top_builddir)/simgear/io/libsgio.la \
++ $(top_builddir)/simgear/sound/libsgsound.la \
++ $(top_builddir)/simgear/scene/sky/libsgsky.la
++ $(top_builddir)/simgear/math/libsgmath.la
INCLUDES = -I$(top_srcdir)
- all: all-am
---- SimGear-0.3.10/simgear/Makefile.am.BAD 2006-10-04 09:01:57.000000000 -0500
-+++ SimGear-0.3.10/simgear/Makefile.am 2006-10-04 09:02:11.000000000 -0500
-@@ -17,8 +17,8 @@ SUBDIRS = \
- xml \
- debug \
- structure \
-- props \
- misc \
-+ props \
- bucket \
- ephemeris \
- serial \
---- SimGear-0.3.10/simgear/screen/Makefile.am.BAD 2006-10-04 09:07:55.000000000 -0500
-+++ SimGear-0.3.10/simgear/screen/Makefile.am 2006-10-04 09:08:12.000000000 -0500
-@@ -45,7 +45,7 @@ TestRenderTexture_SOURCES = TestRenderTe
- TestRenderTexture_LDFLAGS = \
- $(top_builddir)/simgear/screen/libsgscreen.la \
- $(top_builddir)/simgear/debug/libsgdebug.la \
-- $(opengl_LIBS) -lz -lplibssg
-+ $(opengl_LIBS) -lz -lplibssg -ljpeg
- endif
-
- INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
---- SimGear-0.3.10/simgear/screen/Makefile.in.BAD 2006-10-04 09:08:30.000000000 -0500
-+++ SimGear-0.3.10/simgear/screen/Makefile.in 2006-10-04 09:08:37.000000000 -0500
-@@ -252,7 +252,7 @@ libsgscreen_la_LDFLAGS = -version-info 1
- @HAVE_GLUT_TRUE at TestRenderTexture_LDFLAGS = \
- @HAVE_GLUT_TRUE@ $(top_builddir)/simgear/screen/libsgscreen.la \
- @HAVE_GLUT_TRUE@ $(top_builddir)/simgear/debug/libsgdebug.la \
-- at HAVE_GLUT_TRUE@ $(opengl_LIBS) -lz -lplibssg
-+ at HAVE_GLUT_TRUE@ $(opengl_LIBS) -lz -lplibssg -ljpeg
-
- INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
- all: all-am
---- SimGear-0.3.10/simgear/Makefile.in.BAD 2006-10-04 09:02:22.000000000 -0500
-+++ SimGear-0.3.10/simgear/Makefile.in 2006-10-04 09:02:36.000000000 -0500
-@@ -199,8 +199,8 @@ SUBDIRS = \
- xml \
- debug \
- structure \
-- props \
- misc \
-+ props \
- bucket \
- ephemeris \
- serial \
Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/FC-6/SimGear.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimGear.spec 28 Mar 2007 13:42:38 -0000 1.1
+++ SimGear.spec 30 Mar 2007 15:14:57 -0000 1.2
@@ -1,6 +1,6 @@
Name: SimGear
Version: 0.3.10
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL
Group: System Environment/Libraries
Summary: Simulation library components
@@ -10,6 +10,9 @@
Patch0: SimGear-0.3.10-shared.patch
Patch1: SimGear-0.3.10-notabbed_value_test.patch
Patch2: SimGear-0.3.10-headers.patch
+Patch3: SimGear-0.3.10-shared-auto.patch
+Patch4: SimGear-0.3.10-thesky.patch
+Patch5: SimGear-0.3.10-untangle.patch
BuildRequires: openal-devel, plib-devel, libXt-devel, libXext-devel
BuildRequires: libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
BuildRequires: zlib-devel, libjpeg-devel
@@ -32,10 +35,17 @@
%prep
%setup -q
+# automake / autoconf input file changes
%patch0 -p1
+# automake / autoconf auto generated changes
+%patch3 -p1
# Have to disable the tabbed_value_test, because otherwise
# we get caught in a loop between libsgprops and libsgmisc.
%patch1 -p1
+# The Sky issue, see bz 208678
+%patch4 -p1
+# Some circular dependcy fixing, see bz 208678
+%patch5 -p1
%build
%configure --with-jpeg-factory --disable-static
@@ -63,14 +73,21 @@
%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS NEWS
-%{_libdir}/*.so.*
+%{_libdir}/lib*-%{version}.so
%files devel
%defattr(-,root,root,-)
%{_includedir}/simgear/
-%{_libdir}/*.so
+%{_libdir}/lib*.so
%changelog
+* Fri Mar 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.10-4
+- link with -release %%{version} libtool flag instead of -version, so that we
+ get unique soname's for each upstream release. (Upstream gives 0 ABI
+ guarantees)
+- fix many undefined-non-weak-symbol's, some still remain though, see bz 208678
+- work around the "thesky" bug, see bz 208678
+
* Wed Oct 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.10-3
- patch out the config internal header calls (not packaged)
- use generic libGL-devel Requires
- Previous message (by thread): rpms/SimGear/devel SimGear-0.3.10-shared-auto.patch, NONE, 1.1 SimGear-0.3.10-thesky.patch, NONE, 1.1 SimGear-0.3.10-untangle.patch, NONE, 1.1 SimGear-0.3.10-shared.patch, 1.1, 1.2 SimGear.spec, 1.1, 1.2
- Next message (by thread): rpms/perl-Contextual-Return/FC-5 perl-Contextual-Return.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list