New upstream version
This commit is contained in:
Tomas Smetana
parent
2f1b3786dd
commit
fd8ee0352d
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ freeglut-2.6.0.tar.gz
|
||||
openglut-0.6.3-doc.tar.gz
|
||||
/freeglut-2.8.0.tar.gz
|
||||
/freeglut-2.8.1.tar.gz
|
||||
/freeglut-3.0.0.tar.gz
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
diff -up freeglut-2.8.1/src/freeglut_menu.c.nocheck freeglut-2.8.1/src/freeglut_menu.c
|
||||
--- freeglut-2.8.1/src/freeglut_menu.c.nocheck 2014-01-23 14:43:19.386742857 +0100
|
||||
+++ freeglut-2.8.1/src/freeglut_menu.c 2014-01-23 14:44:26.322770844 +0100
|
||||
@@ -866,8 +866,6 @@ int FGAPIENTRY glutCreateMenu( void(* ca
|
||||
{
|
||||
/* The menu object creation code resides in freeglut_structure.c */
|
||||
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
return fgCreateMenu( callback )->ID;
|
||||
}
|
||||
|
||||
@@ -891,9 +889,6 @@ void FGAPIENTRY glutDestroyMenu( int men
|
||||
|
||||
freeglut_return_if_fail( menu );
|
||||
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
-
|
||||
/* The menu object destruction code resides in freeglut_structure.c */
|
||||
fgDestroyMenu( menu );
|
||||
}
|
||||
@@ -936,8 +931,6 @@ void FGAPIENTRY glutAddMenuEntry( const
|
||||
menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
menuEntry->Text = strdup( label );
|
||||
menuEntry->ID = value;
|
||||
@@ -961,8 +954,6 @@ void FGAPIENTRY glutAddSubMenu( const ch
|
||||
subMenu = fgMenuByID( subMenuID );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
freeglut_return_if_fail( subMenu );
|
||||
|
||||
@@ -984,8 +975,6 @@ void FGAPIENTRY glutChangeToMenuEntry( i
|
||||
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToMenuEntry" );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
/* Get n-th menu entry in the current menu, starting from one: */
|
||||
menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item );
|
||||
@@ -1014,8 +1003,6 @@ void FGAPIENTRY glutChangeToSubMenu( int
|
||||
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToSubMenu" );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
/* Get handle to sub menu */
|
||||
subMenu = fgMenuByID( subMenuID );
|
||||
@@ -1048,8 +1035,6 @@ void FGAPIENTRY glutRemoveMenuItem( int
|
||||
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutRemoveMenuItem" );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
/* Get n-th menu entry in the current menu, starting from one: */
|
||||
menuEntry = fghFindMenuEntry( fgStructure.CurrentMenu, item );
|
||||
@@ -1074,8 +1059,6 @@ void FGAPIENTRY glutAttachMenu( int butt
|
||||
freeglut_return_if_fail( fgStructure.CurrentWindow );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
freeglut_return_if_fail( button >= 0 );
|
||||
freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS );
|
||||
@@ -1093,8 +1076,6 @@ void FGAPIENTRY glutDetachMenu( int butt
|
||||
freeglut_return_if_fail( fgStructure.CurrentWindow );
|
||||
|
||||
freeglut_return_if_fail( fgStructure.CurrentMenu );
|
||||
- if (fgGetActiveMenu())
|
||||
- fgError("Menu manipulation not allowed while menus in use.");
|
||||
|
||||
freeglut_return_if_fail( button >= 0 );
|
||||
freeglut_return_if_fail( button < FREEGLUT_MAX_MENUS );
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: A freely licensed alternative to the GLUT library
|
||||
Name: freeglut
|
||||
Version: 2.8.1
|
||||
Release: 5%{?dist}
|
||||
Version: 3.0.0
|
||||
Release: 1%{?dist}
|
||||
URL: http://freeglut.sourceforge.net
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
# For the manpages
|
||||
@ -9,6 +9,7 @@ Source1: http://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: pkgconfig libGLU-devel libXext-devel libXxf86vm-devel
|
||||
BuildRequires: libXi-devel libICE-devel
|
||||
# The virtual Provides below is present so that this freeglut package is a
|
||||
@ -18,8 +19,6 @@ BuildRequires: libXi-devel libICE-devel
|
||||
# freeglut. Note: This package will NOT co-exist with the glut package.
|
||||
Provides: glut = 3.7
|
||||
Obsoletes: glut < 3.7
|
||||
# #1017551: Don't check whether a menu is active while manipulating it
|
||||
Patch0: freeglut-2.8.1-nocheck.patch
|
||||
|
||||
%description
|
||||
freeglut is a completely open source alternative to the OpenGL Utility Toolkit
|
||||
@ -50,17 +49,14 @@ license.
|
||||
|
||||
%prep
|
||||
%setup -q -a 1
|
||||
%patch0 -p1 -b .nocheck
|
||||
|
||||
%build
|
||||
# --disable-warnings -> don't add -Werror to CFLAGS
|
||||
%configure --disable-static --disable-warnings
|
||||
%{cmake} -DFREEGLUT_BUILD_STATIC_LIBS=OFF .
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
|
||||
install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3
|
||||
@ -72,7 +68,7 @@ install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO doc/*.png doc/*.html
|
||||
%doc AUTHORS ChangeLog COPYING README doc/*.png doc/*.html
|
||||
# don't include contents of doc/ directory as it is mostly obsolete
|
||||
%{_libdir}/libglut*.so.*
|
||||
|
||||
@ -80,10 +76,14 @@ install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/GL/*.h
|
||||
%{_libdir}/libglut.so
|
||||
%{_libdir}/pkgconfig/freeglut.pc
|
||||
%{_mandir}/man3/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 10 2015 Tomas Smetana <tsmetana@redhat.com> 3.0.0-1
|
||||
- New upstream version
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user