SOURCES: SimGear-libs.patch, SimGear-shared.patch - patches update...

blekot blekot at pld-linux.org
Wed Dec 7 21:11:30 CET 2005 

Author: blekot                       Date: Wed Dec  7 20:11:30 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patches updated to 0.3.9

---- Files affected:
SOURCES:
   SimGear-libs.patch (1.1 -> 1.2) , SimGear-shared.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/SimGear-libs.patch
diff -u SOURCES/SimGear-libs.patch:1.1 SOURCES/SimGear-libs.patch:1.2
--- SOURCES/SimGear-libs.patch:1.1	Mon Mar 29 14:10:32 2004
+++ SOURCES/SimGear-libs.patch	Wed Dec  7 21:11:25 2005
@@ -9,25 +9,6 @@
  	-lz
  
  INCLUDES = -I$(top_srcdir)
-diff -Naur SimGear-0.3.5/simgear/Makefile.am SimGear-0.3.5-p/simgear/Makefile.am
---- SimGear-0.3.5/simgear/Makefile.am	Mon Mar 29 12:29:11 2004
-+++ SimGear-0.3.5-p/simgear/Makefile.am	Mon Mar 29 12:29:46 2004
-@@ -18,6 +18,7 @@
- 	debug \
- 	structure \
- 	timing \
-+	props \
- 	misc \
- 	bucket \
- 	ephemeris \
-@@ -27,7 +28,6 @@
- 	math \
- 	$(METAR_DIRS) \
- 	nasal \
--	props \
- 	route \
- 	scene \
- 	screen \
 diff -Naur SimGear-0.3.5/simgear/props/Makefile.am SimGear-0.3.5-p/simgear/props/Makefile.am
 --- SimGear-0.3.5/simgear/props/Makefile.am	Mon Mar 29 12:29:11 2004
 +++ SimGear-0.3.5-p/simgear/props/Makefile.am	Mon Mar 29 12:30:07 2004
@@ -145,3 +126,33 @@
 +	$(top_builddir)/simgear/structure/libsgstructure.la \
  	-lz
  	$(base_LIBS)
+--- SimGear-0.3.9.old/simgear/Makefile.am	2005-12-07 19:31:45.000000000 +0100
++++ SimGear-0.3.9/simgear/Makefile.am	2005-12-07 20:52:26.000000000 +0100
+@@ -16,8 +16,11 @@
+ 	$(compatibility_DIR) \
+ 	xml \
+ 	debug \
+-	misc \
++	props \
++	serial \
+ 	structure \
++	timing \
++	misc \
+ 	bucket \
+ 	ephemeris \
+ 	io \
+@@ -25,13 +28,10 @@
+ 	math \
+ 	$(METAR_DIRS) \
+ 	nasal \
+-	props \
+ 	route \
+ 	scene \
+ 	screen \
+-	serial \
+ 	sound \
+-	$(SGTHREAD_DIR) \
+-	timing
++	$(SGTHREAD_DIR)
+ 
+ DIST_SUBDIRS = $(SUBDIRS) compatibility threads

================================================================
Index: SOURCES/SimGear-shared.patch
diff -u SOURCES/SimGear-shared.patch:1.8 SOURCES/SimGear-shared.patch:1.9
--- SOURCES/SimGear-shared.patch:1.8	Sun Aug  1 19:13:12 2004
+++ SOURCES/SimGear-shared.patch	Wed Dec  7 21:11:25 2005
@@ -10,34 +10,6 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
  
-diff -Naur SimGear-0.3.5/simgear/Makefile.am SimGear-0.3.5-p/simgear/Makefile.am
---- SimGear-0.3.5/simgear/Makefile.am	Thu Mar 18 15:51:22 2004
-+++ SimGear-0.3.5-p/simgear/Makefile.am	Mon Mar 29 11:47:51 2004
-@@ -16,10 +16,12 @@
- 	$(compatibility_DIR) \
- 	xml \
- 	debug \
--	misc \
- 	structure \
-+	timing \
-+	misc \
- 	bucket \
- 	ephemeris \
-+	serial \
- 	io \
- 	magvar \
- 	math \
-@@ -29,10 +31,8 @@
- 	route \
- 	scene \
- 	screen \
--	serial \
- 	sound \
- 	$(SGTHREAD_DIR) \
--	timing \
- 	xgl
- 
- DIST_SUBDIRS = $(SUBDIRS) compatibility threads
 diff -Naur SimGear-0.3.5/simgear/bucket/Makefile.am SimGear-0.3.5-p/simgear/bucket/Makefile.am
 --- SimGear-0.3.5/simgear/bucket/Makefile.am	Sat Sep  7 04:58:19 2002
 +++ SimGear-0.3.5-p/simgear/bucket/Makefile.am	Mon Mar 29 11:47:51 2004
@@ -79,10 +51,10 @@
 -lib_LIBRARIES = libsgenvironment.a
 +lib_LTLIBRARIES = libsgenvironment.la
  
- include_HEADERS = metar.hxx
+ include_HEADERS = metar.hxx visual_enviro.hxx
  
--libsgenvironment_a_SOURCES = metar.cxx
-+libsgenvironment_la_SOURCES = metar.cxx
+-libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx
++libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx
  
  INCLUDES = -I$(top_srcdir)
 diff -Naur SimGear-0.3.5/simgear/ephemeris/Makefile.am SimGear-0.3.5-p/simgear/ephemeris/Makefile.am
@@ -414,46 +386,6 @@
  	animation.cxx \
  	location.cxx \
  	model.cxx \
-diff -Naur SimGear-0.3.5/simgear/scene/sky/Makefile.am SimGear-0.3.5-p/simgear/scene/sky/Makefile.am
---- SimGear-0.3.5/simgear/scene/sky/Makefile.am	Mon Aug  4 19:45:34 2003
-+++ SimGear-0.3.5-p/simgear/scene/sky/Makefile.am	Mon Mar 29 11:47:56 2004
-@@ -2,7 +2,7 @@
- 
- SUBDIRS = clouds3d
- 
--lib_LIBRARIES = libsgsky.a
-+lib_LTLIBRARIES = libsgsky.la
- 
- include_HEADERS = \
- 	cloud.hxx \
-@@ -13,7 +13,7 @@
- 	sphere.hxx \
- 	stars.hxx
- 
--libsgsky_a_SOURCES = \
-+libsgsky_la_SOURCES = \
- 	cloud.cxx \
- 	dome.cxx \
- 	moon.cxx \
-diff -Naur SimGear-0.3.5/simgear/scene/sky/clouds3d/Makefile.am SimGear-0.3.5-p/simgear/scene/sky/clouds3d/Makefile.am
---- SimGear-0.3.5/simgear/scene/sky/clouds3d/Makefile.am	Mon Aug 11 23:17:02 2003
-+++ SimGear-0.3.5-p/simgear/scene/sky/clouds3d/Makefile.am	Mon Mar 29 11:47:56 2004
-@@ -9,13 +9,13 @@
-   EXTGL_SOURCE = 
- endif
- 
--lib_LIBRARIES = libsgclouds3d.a
-+lib_LTLIBRARIES = libsgclouds3d.la
- 
- include_HEADERS = \
- 	SkySceneLoader.hpp \
- 	SkyUtil.hpp
- 
--libsgclouds3d_a_SOURCES = \
-+libsgclouds3d_la_SOURCES = \
-         $(EXTGL_SOURCE) \
- 	vec3fv.cpp vec3fv.hpp vec3f.hpp vec4f.hpp vec2f.hpp \
- 	mat16fv.cpp mat16fv.hpp \
 diff -Naur SimGear-0.3.5/simgear/scene/tgdb/Makefile.am SimGear-0.3.5-p/simgear/scene/tgdb/Makefile.am
 --- SimGear-0.3.5/simgear/scene/tgdb/Makefile.am	Tue Dec 30 20:36:48 2003
 +++ SimGear-0.3.5-p/simgear/scene/tgdb/Makefile.am	Mon Mar 29 11:47:56 2004
@@ -626,24 +558,27 @@
  	geocoord.cxx \
  	lowleveltime.cxx \
  	sg_time.cxx \
-diff -Naur SimGear-0.3.5/simgear/xgl/Makefile.am SimGear-0.3.5-p/simgear/xgl/Makefile.am
---- SimGear-0.3.5/simgear/xgl/Makefile.am	Sat Sep  7 04:58:19 2002
-+++ SimGear-0.3.5-p/simgear/xgl/Makefile.am	Mon Mar 29 11:47:56 2004
-@@ -1,9 +1,9 @@
- includedir = @includedir@/xgl
- 
--lib_LIBRARIES = libsgxgl.a
-+lib_LTLIBRARIES = libsgxgl.la
+--- SimGear-0.3.9.old/simgear/scene/sky/Makefile.am	2005-12-07 19:31:44.000000000 +0100
++++ SimGear-0.3.9/simgear/scene/sky/Makefile.am	2005-12-07 19:54:21.000000000 +0100
+@@ -1,6 +1,6 @@
+ includedir = @includedir@/scene/sky
  
- include_HEADERS = xgl.h
+-lib_LIBRARIES = libsgsky.a
++lib_LIBRARIES = libsgsky.la
  
--libsgxgl_a_SOURCES = xgl.c xglUtils.c
-+libsgxgl_la_SOURCES = xgl.c xglUtils.c
+ include_HEADERS = \
+ 	cloud.hxx \
+@@ -14,7 +14,7 @@
+ 	cloudfield.hxx \
+ 	newcloud.hxx
  
- INCLUDES = -I$(top_srcdir)
-diff -Naur SimGear-0.3.5/simgear/xml/Makefile.am SimGear-0.3.5-p/simgear/xml/Makefile.am
---- SimGear-0.3.5/simgear/xml/Makefile.am	Fri Aug 29 19:36:30 2003
-+++ SimGear-0.3.5-p/simgear/xml/Makefile.am	Mon Mar 29 11:47:56 2004
+-libsgsky_a_SOURCES = \
++libsgsky_la_SOURCES = \
+ 	cloud.cxx \
+ 	dome.cxx \
+ 	moon.cxx \
+--- SimGear-0.3.9.old/simgear/xml/Makefile.am	2005-12-07 19:31:44.000000000 +0100
++++ SimGear-0.3.9/simgear/xml/Makefile.am	2005-12-07 20:03:24.000000000 +0100
 @@ -1,6 +1,6 @@
  includedir = @includedir@/xml
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/SimGear-libs.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/SimGear-shared.patch?r1=1.8&r2=1.9&f=u

More information about the pld-cvs-commit mailing list