OBS User unknown 2009-01-19 00:46:29 +00:00 committed by Git OBS Bridge
parent 1d6141d03c
commit 23f3759269
3 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,28 @@
Index: src/freeglut_window.c
===================================================================
--- src/freeglut_window.c (revision 761)
+++ src/freeglut_window.c (working copy)
@@ -458,10 +458,9 @@ void fgSetWindow ( SFG_Window *window )
{
#if TARGET_HOST_POSIX_X11
if ( window )
- glXMakeContextCurrent(
+ glXMakeCurrent(
fgDisplay.Display,
window->Window.Handle,
- window->Window.Handle,
window->Window.Context
);
#elif TARGET_HOST_MS_WINDOWS
@@ -755,10 +754,9 @@ void fgOpenWindow( SFG_Window* window, const char*
XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
&fgDisplay.DeleteWindow, 1 );
- glXMakeContextCurrent(
+ glXMakeCurrent(
fgDisplay.Display,
window->Window.Handle,
- window->Window.Handle,
window->Window.Context
);

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jan 17 12:47:22 CET 2009 - sndirsch@suse.de
- freeglut-sig11-bug466806.diff
* fix Sig11 in glutCreateWindow() for GLX drivers < 1.3
(bnc #466806)
-------------------------------------------------------------------
Wed Dec 10 12:34:56 CET 2008 - olh@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package freeglut (Version 080721)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Name: freeglut
BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel
Summary: Freely licensed alternative to the GLUT library
Version: 080721
Release: 20
Release: 21
Url: http://freeglut.sourceforge.net/
%define USE_EXTERNAL_MESA 1
Source0: freeglut-%{version}.tar.bz2
@ -32,6 +32,7 @@ Source3: xdriinfo-1.0.2.tar.bz2
Source4: compat70.tar.bz2
Patch: freeglut-%{version}.diff
Patch1: glxdemos.diff
Patch2: freeglut-sig11-bug466806.diff
License: X11/MIT
Provides: mesaglut
Obsoletes: mesaglut
@ -97,6 +98,7 @@ joystick functions on a wide range of platforms.
%prep
%setup -q -b1 -b2 -b3 -b4 -n freeglut
%patch
%patch2
%if %USE_EXTERNAL_MESA
pushd ..
%patch1
@ -190,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
* Sat Jan 17 2009 sndirsch@suse.de
- freeglut-sig11-bug466806.diff
* fix Sig11 in glutCreateWindow() for GLX drivers < 1.3
(bnc #466806)
* Wed Dec 10 2008 olh@suse.de
- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
(bnc#437293)