[mingw-freeglut] Added win64 support

Erik van Pienbroek epienbro at fedoraproject.org
Fri Jun 15 18:29:03 UTC 2012


commit 4d9df56e9dc438f577487d2d598d624eb0332c3e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jun 15 20:28:53 2012 +0200

    Added win64 support
    
    and automatically generate debuginfo subpackages

 mingw-freeglut.spec |   65 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 21 deletions(-)
---
diff --git a/mingw-freeglut.spec b/mingw-freeglut.spec
index 4325665..5298fdd 100644
--- a/mingw-freeglut.spec
+++ b/mingw-freeglut.spec
@@ -1,9 +1,8 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
+%{?mingw_package_header}
 
 Name:           mingw-freeglut
 Version:        2.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)
 
 License:        MIT
@@ -12,21 +11,16 @@ Group:          Development/Libraries
 URL:            http://freeglut.sourceforge.net
 Source0:        http://downloads.sourceforge.net/freeglut/freeglut-%{version}.tar.gz
 
-# Patches from native Fedora package:
-# (none)
-
-# Case sensitivity of the header includes.
-Patch1000:      freeglut-2.6.0-header-case.patch
-
-# Hack to disable X / enable Windows in the configure.ac file.
-Patch1001:      freeglut-2.6.0-disable-X.patch
-
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 35
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+
 BuildRequires:  dos2unix
 
 
@@ -42,9 +36,7 @@ freeglut allows the user to create and manage windows containing
 OpenGL contexts on a wide range of platforms and also read the mouse,
 keyboard and joystick functions.
 
-%{mingw32_description}
-
-
+# Win32
 %package -n mingw32-freeglut
 Summary:        Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)
 
@@ -60,7 +52,24 @@ freeglut allows the user to create and manage windows containing
 OpenGL contexts on a wide range of platforms and also read the mouse,
 keyboard and joystick functions.
 
-%{mingw32_description}
+# Win64
+%package -n mingw64-freeglut
+Summary:        Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)
+
+%description -n mingw64-freeglut
+freeglut is a completely open source alternative to the OpenGL Utility
+Toolkit (GLUT) library with an OSI approved free software
+license. GLUT was originally written by Mark Kilgard to support the
+sample programs in the second edition OpenGL 'RedBook'. Since then,
+GLUT has been used in a wide variety of practical applications because
+it is simple, universally available and highly portable.
+
+freeglut allows the user to create and manage windows containing
+OpenGL contexts on a wide range of platforms and also read the mouse,
+keyboard and joystick functions.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -70,14 +79,15 @@ dos2unix -k FrequentlyAskedQuestions
 
 
 %build
-%{mingw32_configure} --disable-static --enable-shared
-make %{?_smp_mflags}
+%mingw_configure --disable-static --enable-shared
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/libglut.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libglut.la
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libglut.la
 
 
 %files -n mingw32-freeglut
@@ -89,8 +99,21 @@ rm $RPM_BUILD_ROOT%{mingw32_libdir}/libglut.la
 %{mingw32_includedir}/GL/freeglut_std.h
 %{mingw32_includedir}/GL/glut.h
 
+%files -n mingw64-freeglut
+%doc AUTHORS COPYING FrequentlyAskedQuestions NEWS README README.win32 TODO
+%{mingw64_bindir}/libglut-0.dll
+%{mingw64_libdir}/libglut.dll.a
+%{mingw64_includedir}/GL/freeglut.h
+%{mingw64_includedir}/GL/freeglut_ext.h
+%{mingw64_includedir}/GL/freeglut_std.h
+%{mingw64_includedir}/GL/glut.h
+
 
 %changelog
+* Fri Jun 15 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-2
+- Added win64 support
+- Automatically generate debuginfo subpackages
+
 * Sun Jun 03 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-1
 - Update to 2.8.0
 - Dropped upstreamed patches


More information about the scm-commits mailing list