git.annexia.org
/
fedora-mingw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now should build on F-10 and Rawhide.
[fedora-mingw.git]
/
ocaml-lablgl
/
mingw32-ocaml-lablgl.spec
diff --git
a/ocaml-lablgl/mingw32-ocaml-lablgl.spec
b/ocaml-lablgl/mingw32-ocaml-lablgl.spec
index
45cb805
..
f82c2a9
100644
(file)
--- a/
ocaml-lablgl/mingw32-ocaml-lablgl.spec
+++ b/
ocaml-lablgl/mingw32-ocaml-lablgl.spec
@@
-6,7
+6,7
@@
Name: mingw32-ocaml-lablgl
Version: 1.03
Name: mingw32-ocaml-lablgl
Version: 1.03
-Release:
1
%{?dist}
+Release:
4
%{?dist}
Summary: MinGW Windows port of LablGL is an OpenGL interface
License: BSD
Summary: MinGW Windows port of LablGL is an OpenGL interface
License: BSD
@@
-19,11
+19,13
@@
Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{vers
Patch0: lablgl-tk8.5.patch
Patch1000: mingw32-ocaml-lablgl-1.03-make-fixes.patch
Patch0: lablgl-tk8.5.patch
Patch1000: mingw32-ocaml-lablgl-1.03-make-fixes.patch
+Patch1001: mingw32-ocaml-lablgl-1.03-no-toplevel.patch
+Patch1002: mingw32-ocaml-lablgl-1.03-evil-glut-header.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 3
5
+BuildRequires: mingw32-filesystem >= 3
8
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@@
-32,6
+34,9
@@
BuildRequires: mingw32-ocaml >= 3.11.0
# labltk is used by the native package, but is essentially optional.
#BuildRequires: mingw32-ocaml-labtk
# labltk is used by the native package, but is essentially optional.
#BuildRequires: mingw32-ocaml-labtk
+# Because of the evil glut patch above, we in fact use the
+# native GLUT header files.
+BuildRequires: freeglut-devel
%description
LablGL is is an Objective Caml interface to OpenGL. Support is
%description
LablGL is is an Objective Caml interface to OpenGL. Support is
@@
-41,7
+46,7
@@
implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX
extension, or with open-source Mesa.
This is the MinGW Windows port of this package. Currently it does not
extension, or with open-source Mesa.
This is the MinGW Windows port of this package. Currently it does not
-support Togl (Tk integration)
or GLUT
.
+support Togl (Tk integration).
%prep
%prep
@@
-49,11
+54,13
@@
support Togl (Tk integration) or GLUT.
%patch0 -p1
%patch1000 -p1
%patch0 -p1
%patch1000 -p1
+%patch1001 -p1
+%patch1002 -p1
cat > Makefile.config <<__EOF__
CAMLC = %{_mingw32_target}-ocamlc
CAMLOPT = %{_mingw32_target}-ocamlopt
cat > Makefile.config <<__EOF__
CAMLC = %{_mingw32_target}-ocamlc
CAMLOPT = %{_mingw32_target}-ocamlopt
-BINDIR = %{_bindir}
+BINDIR = %{_
mingw32_
bindir}
#XINCLUDES = -I%{_prefix}/X11R6/include
#XLIBS = -lXext -lXmu -lX11
#TKINCLUDES = -I%{_includedir}
#XINCLUDES = -I%{_prefix}/X11R6/include
#XLIBS = -lXext -lXmu -lX11
#TKINCLUDES = -I%{_includedir}
@@
-61,7
+68,7
@@
GLINCLUDES = -DHAS_GLEXT_H -DGL_GLEXT_PROTOTYPES -DGLU_VERSION_1_3
GLLIBS = -lglu32 -lopengl32
GLUTLIBS = -lglut32
RANLIB = i686-pc-mingw32-ranlib
GLLIBS = -lglu32 -lopengl32
GLUTLIBS = -lglut32
RANLIB = i686-pc-mingw32-ranlib
-TOOLCHAIN =
msvc
+TOOLCHAIN =
unix
XB = .bat
XE = .exe
XS = .dll
XB = .bat
XE = .exe
XS = .dll
@@
-77,19
+84,21
@@
__EOF__
%build
%build
-make lib
-make libopt
+# XXX w32api-3.12 had libglut32.a, but 3.13 lacks this, so we have
+# had to disable glut compilation.
+#make LIBRARIAN=i686-pc-mingw32-ocamlmklib lib glut libopt glutopt
+make LIBRARIAN=i686-pc-mingw32-ocamlmklib lib libopt
%install
rm -rf $RPM_BUILD_ROOT
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_
mingw32_
bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/lablGL
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/stublibs
make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/lablGL \
DLLDIR=$RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/stublibs \
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/lablGL
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/stublibs
make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/lablGL \
DLLDIR=$RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/stublibs \
- BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ BINDIR=$RPM_BUILD_ROOT%{_
mingw32_
bindir} \
install
# Make and install a META file.
install
# Make and install a META file.
@@
-118,9
+127,16
@@
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%files
%defattr(-,root,root)
+# XXX See above for reason why glut is missing.
+#%{_mingw32_bindir}/lablglut.bat
%{_libdir}/%{_mingw32_target}-ocaml/lablGL/
%{_libdir}/%{_mingw32_target}-ocaml/lablGL/
+%{_libdir}/%{_mingw32_target}-ocaml/stublibs/dlllablgl.dll
+#%{_libdir}/%{_mingw32_target}-ocaml/stublibs/dlllablglut.dll
%changelog
%changelog
-* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.03-1
+* Sat Jan 24 2009 Richard W.M. Jones <rjones@redhat.com> - 1.03-4
+- Disable GLUT since the library has been dropped from w32api.
+
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.03-3
- Initial RPM release.
- Initial RPM release.