[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/hugs98/FC-5 openal-1.0_1.2.patch,NONE,1.1 hugs98.spec,1.3,1.4



Author: gemi

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

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV= CALLCONV@
 cc-options: -DCALLCONV= CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven panne aedion de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven panne aedion de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven panne aedion de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hugs98.spec	24 Apr 2006 03:25:49 -0000	1.3
+++ hugs98.spec	24 Apr 2006 10:49:34 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -23,7 +24,7 @@
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -31,6 +32,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -82,6 +92,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -116,6 +127,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -128,6 +140,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -149,6 +166,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi bluewin ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi bluewin ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]