diff options
author | adam <adam@pkgsrc.org> | 2004-12-01 13:59:43 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2004-12-01 13:59:43 +0000 |
commit | 1635a7c23aa4749a2c6283cecd078d35528eb02e (patch) | |
tree | aa616d7465b6813b0da8184583e5ace544b6780c /audio | |
parent | dbaf076852ed5033b95c5dc818bc312662705bfd (diff) | |
download | pkgsrc-1635a7c23aa4749a2c6283cecd078d35528eb02e.tar.gz |
Changes 20040816:
* Improvements toward the stable release
Diffstat (limited to 'audio')
-rw-r--r-- | audio/openal/Makefile | 16 | ||||
-rw-r--r-- | audio/openal/PLIST | 7 | ||||
-rw-r--r-- | audio/openal/distinfo | 10 | ||||
-rw-r--r-- | audio/openal/patches/patch-ab | 8 | ||||
-rw-r--r-- | audio/openal/patches/patch-ac | 61 | ||||
-rw-r--r-- | audio/openal/patches/patch-ad | 26 |
6 files changed, 107 insertions, 21 deletions
diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 803ab5e3b03..1716d6c4733 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2004/05/07 01:14:46 xtraeme Exp $ -# +# $NetBSD: Makefile,v 1.11 2004/12/01 13:59:43 adam Exp $ -DISTNAME= openal-20030724 +DISTNAME= openal-20040816 CATEGORIES= audio MASTER_SITES= http://math.smsu.edu/~erik/files/fbsd/ \ http://www.smluc.org/~erik/ \ @@ -11,12 +10,13 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.openal.org/ COMMENT= 3D positional spatialized sound library -WRKSRC= ${WRKDIR}/${DISTNAME}/linux -GNU_CONFIGURE= YES -USE_BUILDLINK3= YES -USE_GNU_TOOLS+= make +WRKSRC= ${WRKDIR}/${DISTNAME}/linux +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make +USE_LIBTOOL= yes +GNU_CONFIGURE= yes -USE_MAKEINFO= YES +USE_MAKEINFO= yes INFO_FILES= openal.info post-install: diff --git a/audio/openal/PLIST b/audio/openal/PLIST index e30bc9a789b..f8da9f970a1 100644 --- a/audio/openal/PLIST +++ b/audio/openal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2004/01/02 18:06:57 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/12/01 13:59:43 adam Exp $ include/AL/al.h include/AL/alc.h include/AL/alctypes.h @@ -9,8 +9,5 @@ include/AL/alu.h include/AL/alut.h include/AL/aluttypes.h include/AL/alutypes.h -lib/libopenal.a -lib/libopenal.so -lib/libopenal.so.0 -lib/libopenal.so.0.0.6 +lib/libopenal.la @dirrm include/AL diff --git a/audio/openal/distinfo b/audio/openal/distinfo index 6461a95300b..d7fd5c2f072 100644 --- a/audio/openal/distinfo +++ b/audio/openal/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.2 2003/09/16 12:16:50 adam Exp $ +$NetBSD: distinfo,v 1.3 2004/12/01 13:59:43 adam Exp $ -SHA1 (openal-20030724.tar.gz) = 9ec09f53678bf9672e1f4bd117fc23f9e562d99f -Size (openal-20030724.tar.gz) = 336690 bytes +SHA1 (openal-20040816.tar.gz) = 0a7939c30176aace28170ce2aa96f19efa00110a +Size (openal-20040816.tar.gz) = 388952 bytes SHA1 (patch-aa) = cbb97881e7c60b227663cba6cf61bc3e585e3ade -SHA1 (patch-ab) = 32c4cf9de6c45fb43bfa35b8c7ca4192e216e379 +SHA1 (patch-ab) = 3bf26efb5c41f2dd867fdfc9a089b2ba0d0e6457 +SHA1 (patch-ac) = 36169f2b1d95d06102a777dbe2bea2a2d9db2b86 +SHA1 (patch-ad) = 5590a7754f3d149e6b52bb0176fd07eed52a880d diff --git a/audio/openal/patches/patch-ab b/audio/openal/patches/patch-ab index 7def7c8b7ff..95cef9bcd40 100644 --- a/audio/openal/patches/patch-ab +++ b/audio/openal/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/03/17 15:57:05 jmmv Exp $ +$NetBSD: patch-ab,v 1.2 2004/12/01 13:59:43 adam Exp $ ---- configure.orig 2003-01-25 23:04:57.000000000 +0000 +--- configure.orig 2004-08-16 15:27:18.000000000 +0000 +++ configure -@@ -3121,8 +3121,67 @@ LIBS=$ac_check_lib_save_LIBS +@@ -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 @@ -70,7 +70,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/03/17 15:57:05 jmmv Exp $ else cat >>confdefs.h <<\_ACEOF -@@ -5694,9 +5753,7 @@ else +@@ -5749,9 +5808,7 @@ else echo "${ECHO_T}no" >&6 fi diff --git a/audio/openal/patches/patch-ac b/audio/openal/patches/patch-ac new file mode 100644 index 00000000000..fb26fa52fa3 --- /dev/null +++ b/audio/openal/patches/patch-ac @@ -0,0 +1,61 @@ +$NetBSD: patch-ac,v 1.1 2004/12/01 13:59:43 adam Exp $ + +--- src/Makefile.in.orig 2004-02-15 13:23:30.000000000 +0000 ++++ src/Makefile.in +@@ -81,12 +81,12 @@ VERSION=$(MAJOR_VERSION).$(MINOR_VERSION + %.o : %.nasm + $(NASM) -f elf -o $@ $< + %.o : %.c al_siteconfig.h ../config.h +- $(CC) $(DEFINES) $(INC) $(CFLAGS) -c $< -o $@ ++ ${LIBTOOL} --mode=compile $(CC) $(DEFINES) $(INC) $(CFLAGS) -c $< -o $@ + + %.def : %.a libopenal.a + dlltool -a $< --output-def $@ + +-all: libopenal.a libopenal.$(SO_EXT) extensions $(TEST_PROGS) ++all: libopenal.la extensions $(TEST_PROGS) + + clean: + -rm -f $(AL_OBJS) +@@ -104,7 +104,7 @@ clean: + distclean: clean + rm -Rf Makefile + +-libopenal: libopenal.a libopenal.$(SO_EXT) ++libopenal: libopenal.la + + libopenal.a: $(AL_OBJS) $(ALC_OBJS) $(AC_OBJS) $(ALUT_OBJS) extensions + ar cru libopenal.a \ +@@ -116,17 +116,12 @@ libopenal.a: $(AL_OBJS) $(ALC_OBJS) $(AC + $(RANLIB) libopenal.a + + +-libopenal.so: $(AL_OBJS) $(ALC_OBJS) $(AC_OBJS) $(ALUT_OBJS) extensions +- $(CC) -shared \ +- -Wl,"-soname,libopenal.so.$(MAJOR_VERSION)" \ +- -o libopenal.so.$(VERSION) \ +- $(LDFLAGS) \ +- $(AL_OBJS) \ +- $(ALC_OBJS) \ +- $(AC_OBJS) \ +- $(ALUT_OBJS) \ +- $(EXT_OBJS) \ +- $(LIBS) ++libopenal.la: $(AL_OBJS) $(ALC_OBJS) $(AC_OBJS) $(ALUT_OBJS) extensions ++ ${LIBTOOL} --mode=link $(CC) -o libopenal.la $(LDFLAGS) \ ++ $(AL_OBJS:.o=.lo) $(ALC_OBJS:.o=.lo) $(AC_OBJS:.o=.lo) \ ++ $(ALUT_OBJS:.o=.lo) $(EXT_OBJS:.o=.lo) $(LIBS) \ ++ -rpath ${PREEFIX}/lib \ ++ -version-info $(MAJOR_VERSION):$(MINOR_VERSION) + + libopenal.dll: $(AL_OBJS) $(ALC_OBJS) $(AC_OBJS) $(ALUT_OBJS) libopenal.def \ + extensions +@@ -150,7 +145,7 @@ extensions: $(EXT_OBJS) $(EXT_DLL_OBJS) + + + $(EXT_OBJS): %.o : %.c ../config.h +- $(CC) $(DEFINES) $(INC) $(CFLAGS) -c $< -o $@ ++ ${LIBTOOL} --mode=compile $(CC) $(DEFINES) $(INC) $(CFLAGS) -c $< -o $@ + + $(EXT_DLL_OBJS): %.o : %.c ../config.h + $(CC) $(DEFINES) $(INC) -DOPENAL_EXTENSION $(CFLAGS) $< -shared -o $@ diff --git a/audio/openal/patches/patch-ad b/audio/openal/patches/patch-ad new file mode 100644 index 00000000000..3743d4beaf7 --- /dev/null +++ b/audio/openal/patches/patch-ad @@ -0,0 +1,26 @@ +$NetBSD: patch-ad,v 1.1 2004/12/01 13:59:43 adam Exp $ + +--- Makefile.in.orig 2003-07-24 17:06:38.000000000 +0000 ++++ Makefile.in +@@ -14,11 +14,9 @@ INSTALL_DEPS=all + + # remind me to look up how to else in a makefile + ifeq ($(DO_MINOR_LIBS),yes) +-INSTALL_DEPS+=install_minor_libs + endif + + ifeq ($(DO_MINOR_LIBS),no) +-INSTALL_DEPS+=install_major_lib_only + endif + + all: configure +@@ -62,8 +60,7 @@ install_major_lib_only: + install: $(INSTALL_DEPS) + $(INSTALL) -d -m 755 $(DESTINC) + $(INSTALL) -d -m 755 $(DESTINC)/AL +- $(INSTALL) -d -m 755 $(DESTLIB) +- $(INSTALL) -m 755 src/libopenal.a $(DESTLIB) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} src/libopenal.la $(DESTLIB) + $(INSTALL) -m 444 ../include/AL/al.h $(DESTINC)/AL + $(INSTALL) -m 444 ../include/AL/alc.h $(DESTINC)/AL + $(INSTALL) -m 444 ../include/AL/alu.h $(DESTINC)/AL |