rpms/stellarium/FC-5 stellarium-0.8.2-x64_1.patch, NONE, 1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec, 1.23, 1.24

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Tue Nov 14 17:33:10 UTC 2006


Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- stellarium.spec	15 Oct 2006 19:41:38 -0000	1.23
+++ stellarium.spec	14 Nov 2006 17:32:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}.2
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:	        stellarium-0.8.2-x64.patch
+Patch1:	        stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Sun Oct 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-1.2
 - Fix segfault on x64 systems (#210525)
 




More information about the scm-commits mailing list