From aea74efec62ed7b1a626071dfc50afcd7dd508e4 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 4 Apr 2008 09:33:10 +0000 Subject: [PATCH] - @requirements@ wasn't properly set in openal.pc, causing openal to never get picked up. - regen patches while here from brad@ --- audio/openal/Makefile | 4 +++- .../patches/patch-admin_pkgconfig_openal_pc_in | 12 ++++++++++++ audio/openal/patches/patch-src_al_mixfunc_c | 8 ++++---- .../patches/patch-src_arch_i386_x86_cpu_caps_prk_c | 8 ++++---- .../patches/patch-src_arch_i386_x86_floatmul_c | 8 ++++---- 5 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 audio/openal/patches/patch-admin_pkgconfig_openal_pc_in diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 709e6030a45..9c4bb301241 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 21:26:02 simon Exp $ +# $OpenBSD: Makefile,v 1.7 2008/04/04 09:33:10 jasper Exp $ COMMENT= cross-platform 3D audio API + DISTNAME= openal-0.0.8 +PKGNAME= ${DISTNAME}p0 CATEGORIES= audio SHARED_LIBS += openal 1.0 # .0.0 diff --git a/audio/openal/patches/patch-admin_pkgconfig_openal_pc_in b/audio/openal/patches/patch-admin_pkgconfig_openal_pc_in new file mode 100644 index 00000000000..2a630236430 --- /dev/null +++ b/audio/openal/patches/patch-admin_pkgconfig_openal_pc_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-admin_pkgconfig_openal_pc_in,v 1.1 2008/04/04 09:33:10 jasper Exp $ +--- admin/pkgconfig/openal.pc.in.orig Sat Feb 11 04:36:55 2006 ++++ admin/pkgconfig/openal.pc.in Tue Apr 1 15:41:59 2008 +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: OpenAL + Description: OpenAL is a cross-platform 3D audio API. +-Requires: @requirements@ ++Requires: + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lopenal + Cflags: -I${includedir} diff --git a/audio/openal/patches/patch-src_al_mixfunc_c b/audio/openal/patches/patch-src_al_mixfunc_c index 4f555cd5933..8dd8c1f2ad7 100644 --- a/audio/openal/patches/patch-src_al_mixfunc_c +++ b/audio/openal/patches/patch-src_al_mixfunc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_al_mixfunc_c,v 1.1 2006/10/30 23:31:37 steven Exp $ ---- src/al_mixfunc.c.orig Sat Oct 21 11:20:39 2006 -+++ src/al_mixfunc.c Sat Oct 21 11:21:02 2006 -@@ -38,7 +38,7 @@ ALboolean _alMixFuncInit( ALMixFunc *mf, +$OpenBSD: patch-src_al_mixfunc_c,v 1.2 2008/04/04 09:33:10 jasper Exp $ +--- src/al_mixfunc.c.orig Fri Sep 30 11:20:51 2005 ++++ src/al_mixfunc.c Tue Apr 1 15:30:54 2008 +@@ -38,7 +38,7 @@ ALboolean _alMixFuncInit( ALMixFunc *mf, ALuint size ) return AL_FALSE; } diff --git a/audio/openal/patches/patch-src_arch_i386_x86_cpu_caps_prk_c b/audio/openal/patches/patch-src_arch_i386_x86_cpu_caps_prk_c index e9c63092832..09bcbe5bee9 100644 --- a/audio/openal/patches/patch-src_arch_i386_x86_cpu_caps_prk_c +++ b/audio/openal/patches/patch-src_arch_i386_x86_cpu_caps_prk_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_arch_i386_x86_cpu_caps_prk_c,v 1.1 2006/10/30 23:31:37 steven Exp $ ---- src/arch/i386/x86_cpu_caps_prk.c.orig Sat Oct 21 11:21:22 2006 -+++ src/arch/i386/x86_cpu_caps_prk.c Sat Oct 21 11:21:42 2006 -@@ -47,7 +47,7 @@ struct x86cpu_caps_s x86cpu_caps_use = { +$OpenBSD: patch-src_arch_i386_x86_cpu_caps_prk_c,v 1.2 2008/04/04 09:33:10 jasper Exp $ +--- src/arch/i386/x86_cpu_caps_prk.c.orig Thu Jan 19 15:58:51 2006 ++++ src/arch/i386/x86_cpu_caps_prk.c Tue Apr 1 15:30:54 2008 +@@ -47,7 +47,7 @@ struct x86cpu_caps_s x86cpu_caps_use = { 1, 1, 1, 1, 1 void _alDetectCPUCaps(void) { /* compile time detection */ diff --git a/audio/openal/patches/patch-src_arch_i386_x86_floatmul_c b/audio/openal/patches/patch-src_arch_i386_x86_floatmul_c index d7c28fc93d6..b3013381422 100644 --- a/audio/openal/patches/patch-src_arch_i386_x86_floatmul_c +++ b/audio/openal/patches/patch-src_arch_i386_x86_floatmul_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_arch_i386_x86_floatmul_c,v 1.1 2006/10/30 23:31:37 steven Exp $ ---- src/arch/i386/x86_floatmul.c.orig Sat Oct 21 11:22:41 2006 -+++ src/arch/i386/x86_floatmul.c Sat Oct 21 11:22:57 2006 -@@ -34,7 +34,7 @@ void _alFloatMul(ALshort *bpt, ALfloat s +$OpenBSD: patch-src_arch_i386_x86_floatmul_c,v 1.2 2008/04/04 09:33:10 jasper Exp $ +--- src/arch/i386/x86_floatmul.c.orig Wed Dec 21 14:06:35 2005 ++++ src/arch/i386/x86_floatmul.c Tue Apr 1 15:30:54 2008 +@@ -34,7 +34,7 @@ void _alFloatMul(ALshort *bpt, ALfloat sa, ALuint len) ALint scaled_sa = sa * SCALING_FACTOR; ALint iter;