summaryrefslogtreecommitdiff
path: root/audio/openal
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-01-03 07:03:15 +0000
committerwiz <wiz@pkgsrc.org>2007-01-03 07:03:15 +0000
commiteeaf8b28f8d1d46d627c7a6e3794ebd9b2a6f3de (patch)
tree6d342a05db8a5a27143430688b85d30d79027e35 /audio/openal
parentc8118f5a246ae33fd57b3b9e52684f1a184115ec (diff)
downloadpkgsrc-eeaf8b28f8d1d46d627c7a6e3794ebd9b2a6f3de.tar.gz
Update to latest version, 0.0.8. Previous version was date-based (and thus
higher), so reset version dependency in buildlink3.mk to current one. No package affected. Changes: About two years of development, only described in ChangeLog AFAICT.
Diffstat (limited to 'audio/openal')
-rw-r--r--audio/openal/Makefile18
-rw-r--r--audio/openal/PLIST12
-rw-r--r--audio/openal/buildlink3.mk5
-rw-r--r--audio/openal/distinfo14
-rw-r--r--audio/openal/patches/patch-aa19
-rw-r--r--audio/openal/patches/patch-ab112
6 files changed, 44 insertions, 136 deletions
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 1f8ca948a85..74da5025414 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,26 +1,22 @@
-# $NetBSD: Makefile,v 1.18 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/03 07:03:15 wiz Exp $
-DISTNAME= openal-20040816
-PKGREVISION= 1
+DISTNAME= openal-0.0.8
CATEGORIES= audio
-MASTER_SITES= http://math.smsu.edu/~erik/files/fbsd/ \
- http://www.smluc.org/~erik/ \
- http://csc.smsu.edu/~greenwald/
+MASTER_SITES= http://www.openal.org/openal_webstf/downloads/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.openal.org/
COMMENT= 3D positional spatialized sound library
-WRKSRC= ${WRKDIR}/${DISTNAME}/linux
USE_TOOLS+= gmake makeinfo
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
INFO_FILES= # PLIST
-INSTALLATION_DIRS= ${PKGINFODIR}
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/${PKGINFODIR}
+INSTALLATION_DIRS= ${PKGINFODIR} include/AL
+PKGCONFIG_OVERRIDE= admin/pkgconfig/openal.pc.in
+LIBS+= ${LIBOSSAUDIO}
.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/openal/PLIST b/audio/openal/PLIST
index cc217de3453..a500465bbd4 100644
--- a/audio/openal/PLIST
+++ b/audio/openal/PLIST
@@ -1,14 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2006/03/30 03:44:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/01/03 07:03:15 wiz Exp $
+bin/openal-config
include/AL/al.h
include/AL/alc.h
-include/AL/alctypes.h
include/AL/alext.h
-include/AL/alexttypes.h
-include/AL/altypes.h
-include/AL/alu.h
-include/AL/alut.h
-include/AL/aluttypes.h
-include/AL/alutypes.h
-info/openal.info
lib/libopenal.la
+lib/pkgconfig/openal.pc
@dirrm include/AL
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
index 8e205d62cd7..7544145a4c5 100644
--- a/audio/openal/buildlink3.mk
+++ b/audio/openal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2007/01/03 07:03:15 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENAL_BUILDLINK3_MK:= ${OPENAL_BUILDLINK3_MK}+
@@ -12,8 +12,7 @@ BUILDLINK_PACKAGES+= openal
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openal
.if !empty(OPENAL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.openal+= openal>=20030125nb1
-BUILDLINK_ABI_DEPENDS.openal?= openal>=20040816nb1
+BUILDLINK_API_DEPENDS.openal+= openal>=0.0.8
BUILDLINK_PKGSRCDIR.openal?= ../../audio/openal
.endif # OPENAL_BUILDLINK3_MK
diff --git a/audio/openal/distinfo b/audio/openal/distinfo
index 96b0e0352f1..62b04f3e2f4 100644
--- a/audio/openal/distinfo
+++ b/audio/openal/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/03/17 22:39:02 jlam Exp $
+$NetBSD: distinfo,v 1.7 2007/01/03 07:03:15 wiz Exp $
-SHA1 (openal-20040816.tar.gz) = 0a7939c30176aace28170ce2aa96f19efa00110a
-RMD160 (openal-20040816.tar.gz) = ec02d6b918d9d6d7f2387fd3d14cfe0a47e034ef
-Size (openal-20040816.tar.gz) = 388952 bytes
-SHA1 (patch-aa) = cbb97881e7c60b227663cba6cf61bc3e585e3ade
-SHA1 (patch-ab) = 5a700f94869a975e8253c708eef5401ff2165b58
-SHA1 (patch-ac) = 36169f2b1d95d06102a777dbe2bea2a2d9db2b86
-SHA1 (patch-ad) = 6d4ef6c32d0f4eb556bad0995abc4d4ab9523c7f
+SHA1 (openal-0.0.8.tar.gz) = 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e
+RMD160 (openal-0.0.8.tar.gz) = 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265
+Size (openal-0.0.8.tar.gz) = 870671 bytes
+SHA1 (patch-aa) = fbd752704cabc991b634c830c427d69dc29e80a5
+SHA1 (patch-ab) = e0bfe865021fa54fe276e1c5da312f6d3747102b
diff --git a/audio/openal/patches/patch-aa b/audio/openal/patches/patch-aa
index 8a6c40efd05..6e8a606bfae 100644
--- a/audio/openal/patches/patch-aa
+++ b/audio/openal/patches/patch-aa
@@ -1,9 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/17 15:57:05 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2007/01/03 07:03:15 wiz Exp $
---- src/arch/bsd/bsd_dsp.c.orig 2003-01-07 02:37:11.000000000 +0000
-+++ src/arch/bsd/bsd_dsp.c
-@@ -15,7 +15,13 @@
+--- src/backends/alc_backend_bsd.c.orig 2006-01-05 15:11:20.000000000 +0000
++++ src/backends/alc_backend_bsd.c
+@@ -10,14 +10,22 @@
+ #include "al_siteconfig.h"
+ #include <AL/al.h>
++#include <AL/alext.h>
#include <assert.h>
#include <fcntl.h>
+#if defined(__FreeBSD__)
@@ -16,7 +19,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/17 15:57:05 jmmv Exp $
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-@@ -212,7 +218,11 @@ void release_native(void *handle) {
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#include <sys/select.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+@@ -210,7 +218,11 @@ void release_native(void *handle) {
handle_fd = *(int *) handle;
diff --git a/audio/openal/patches/patch-ab b/audio/openal/patches/patch-ab
index 623d52afe50..b013fbc3b9a 100644
--- a/audio/openal/patches/patch-ab
+++ b/audio/openal/patches/patch-ab
@@ -1,101 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2005/12/11 21:42:02 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/01/03 07:03:15 wiz Exp $
---- configure.orig 2004-08-16 15:27:18.000000000 +0000
-+++ configure
-@@ -3123,8 +3123,67 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+
-+if test $ac_cv_lib_dl_dlopen != yes; then
-+ echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
-+if test "${ac_cv_lib_c_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+#ifdef F77_DUMMY_MAIN
-+# ifdef __cplusplus
-+ extern "C"
-+# endif
-+ int F77_DUMMY_MAIN() { return 1; }
-+#endif
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_c_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_c_dlopen=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_c_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_dlopen" >&6
-+fi
- if test $ac_cv_lib_dl_dlopen = yes; then
- LIBS="$LIBS -ldl"
-+elif test $ac_cv_lib_c_dlopen = yes; then
-+ :
- else
-
- cat >>confdefs.h <<\_ACEOF
-@@ -3214,7 +3273,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
-
- OS_OBJS="\$(LIN_OBJS)" ;;
-- *bsd*)
-+ *bsd* | *dragonfly*)
- BROKEN_PTHREAD_FLAG=yes
-
- cat >>confdefs.h <<\_ACEOF
-@@ -3301,7 +3360,7 @@ case "$target" in
- *linux*)
- # No extra libs needed
- ;;
-- *bsd*)
-+ *bsd* | *dragonfly*)
- # No extra libs needed
- ;;
- *solaris*)
-@@ -5749,9 +5808,7 @@ else
- echo "${ECHO_T}no" >&6
- fi
-
--if test $MAKEINFO = yes; then
-- MAKEINFO='makeinfo'
--else
-+if test $MAKEINFO = no; then
- # for silly people without texinfo
- MAKEINFO='@echo'
- fi
+--- admin/pkgconfig/openal-config.in.orig 2006-02-11 09:36:55.000000000 +0000
++++ admin/pkgconfig/openal-config.in
+@@ -165,7 +165,7 @@ if test "$echo_libs" = "yes"; then
+ if test "${libdir}" = "/usr/lib" ; then
+ libpathflag=""
+ else
+- libpathflag="-L${libdir}"
++ libpathflag="-Wl,-R${libdir} -L${libdir}"
+ fi
+ if test "${static_libs}" = "yes"; then
+ ldflags="${openal_static_ldflags}"