cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak build, so that it won't try to pull in audiofile, and so that it

Browse Source 
pulls the right gsm build, thus avoiding rebuild.
This commit is contained in:
espie 2001-07-30 15:47:16 +00:00
parent 9092e73fa6
commit 9698544b85
3 changed files with 124 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mbone/vat/Makefile
View File

@ -1,5 +1,5 @@
# $FreeBSD: Makefile,v 1.9 1998/12/02 05:56:01 asami Exp $
# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:27 pvalchev Exp $
# $OpenBSD: Makefile,v 1.18 2001/07/30 15:47:16 espie Exp $
COMMENT= "The Visual Audio Tool - multicast audioconferencing"
@ -19,10 +19,7 @@ PERMIT_DISTFILES_FTP= Yes
GSM_DIR= audio/gsm
# If configure is changed to look for libgsm.a in ${PREFIX}/lib, then
# we can use this first BUILD_DEPENDS and save some work.
#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h::${GSM_DIR}:patch
BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a::${GSM_DIR}:build
BUILD_DEPENDS= /nonexistent::${GSM_DIR}:patch
LIB_DEPENDS= tcl80.1.5::lang/tcl/8.0 \
tk80.1.5::x11/tk/8.0 \
gsm.1::${GSM_DIR}
@ -30,6 +27,9 @@ LIB_DEPENDS= tcl80.1.5::lang/tcl/8.0 \
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-gsm=${GSM_WORK}
CONFIGURE_ENV= V_LIB_GSM='-L${PREFIX}/lib -lgsm'
CONFIGURE_ARGS+=--without-af
WRKDIST= ${WRKDIR}/${PKGNAME}

60
mbone/vat/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.2 2001/07/30 15:33:22 espie Exp $
$OpenBSD: patch-configure,v 1.3 2001/07/30 15:47:16 espie Exp $
--- configure.orig Thu May 16 10:03:58 1996
+++ configure Mon Jul 30 17:25:38 2001
+++ configure Mon Jul 30 15:38:05 2001
@@ -1533,6 +1533,7 @@ rm -f conftest*
$x_includes/tk \
$x_includes \
@ -57,3 +57,59 @@ $OpenBSD: patch-configure,v 1.2 2001/07/30 15:33:22 espie Exp $
/usr/contrib/lib/tk4.1 \
/usr/lib/tk4.1 \
/usr/lib/tk/tk4.1 \
@@ -1861,10 +1863,12 @@ if test "$d" != "" ; then
echo "'$d' is not a directory"
exit 1
fi
- V_LIB_GSM=$d/lib/libgsm.a
- if test ! -r $V_LIB_GSM ; then
- echo "can't find libgsm.a in $d/lib"
- exit 1
+ if test x"$V_LIB_GSM" == x""; then
+ V_LIB_GSM=$d/lib/libgsm.a
+ if test ! -r $V_LIB_GSM ; then
+ echo "can't find libgsm.a in $d/lib"
+ exit 1
+ fi
fi
V_INCLUDE_GSM=-I$d/inc
if test ! -r $d/inc/private.h ; then
@@ -1905,21 +1909,23 @@ else
fi
if test "$d" != "" ; then
- if test ! -d $d ; then
- echo "'$d' is not a directory"
- exit 1
- fi
- if test ! -r $d/AF/lib/AF/libAF.a ; then
- echo "can't find libAF.a in $d/AF/lib/AF"
- exit 1
- fi
- if test ! -r $d/AF/lib/AF/AFlib.h ; then
- echo "can't find AFlib.h in $d/AF/lib/AF"
- exit 1
- fi
- V_LIB="$V_LIB $d/AF/lib/AF/libAF.a"
- V_INCLUDE="$V_INCLUDE -I$d/AF/lib -I$d/AF"
- V_OBJ_AUDIO="$V_OBJ_AUDIO audio-af.o"
+ if test "$d" != "no"; then
+ if test ! -d $d ; then
+ echo "'$d' is not a directory"
+ exit 1
+ fi
+ if test ! -r $d/AF/lib/AF/libAF.a ; then
+ echo "can't find libAF.a in $d/AF/lib/AF"
+ exit 1
+ fi
+ if test ! -r $d/AF/lib/AF/AFlib.h ; then
+ echo "can't find AFlib.h in $d/AF/lib/AF"
+ exit 1
+ fi
+ V_LIB="$V_LIB $d/AF/lib/AF/libAF.a"
+ V_INCLUDE="$V_INCLUDE -I$d/AF/lib -I$d/AF"
+ V_OBJ_AUDIO="$V_OBJ_AUDIO audio-af.o"
+ fi
else
echo "checking for AudioFile"
places="../AudioFile-3.1 \

67
mbone/vat/patches/patch-configure_in
View File

@ -1,15 +1,70 @@
$OpenBSD: patch-configure_in,v 1.1 2001/07/30 15:33:22 espie Exp $
$OpenBSD: patch-configure_in,v 1.2 2001/07/30 15:47:16 espie Exp $
--- configure.in.orig Thu May 16 14:21:17 1996
+++ configure.in Mon Jul 30 17:25:38 2001
@@ -151,6 +151,11 @@ sparc-sun-sunos*)
+++ configure.in Mon Jul 30 15:38:01 2001
@@ -22,10 +22,12 @@ if test "$d" != "" ; then
echo "'$d' is not a directory"
exit 1
fi
- V_LIB_GSM=$d/lib/libgsm.a
- if test ! -r $V_LIB_GSM ; then
- echo "can't find libgsm.a in $d/lib"
- exit 1
+ if test x"$V_LIB_GSM" == x""; then
+ V_LIB_GSM=$d/lib/libgsm.a
+ if test ! -r $V_LIB_GSM ; then
+ echo "can't find libgsm.a in $d/lib"
+ exit 1
+ fi
fi
V_INCLUDE_GSM=-I$d/inc
if test ! -r $d/inc/private.h ; then
@@ -59,21 +61,23 @@ AC_SUBST(V_INCLUDE_GSM)
AC_ARG_WITH(af, --with-af=path specify a pathname for AudioFile, d=$withval, d="")
if test "$d" != "" ; then
- if test ! -d $d ; then
- echo "'$d' is not a directory"
- exit 1
- fi
- if test ! -r $d/AF/lib/AF/libAF.a ; then
- echo "can't find libAF.a in $d/AF/lib/AF"
- exit 1
+ if test "$d" != "no"; then
+ if test ! -d $d ; then
+ echo "'$d' is not a directory"
+ exit 1
+ fi
+ if test ! -r $d/AF/lib/AF/libAF.a ; then
+ echo "can't find libAF.a in $d/AF/lib/AF"
+ exit 1
+ fi
+ if test ! -r $d/AF/lib/AF/AFlib.h ; then
+ echo "can't find AFlib.h in $d/AF/lib/AF"
+ exit 1
+ fi
+ V_LIB="$V_LIB $d/AF/lib/AF/libAF.a"
+ V_INCLUDE="$V_INCLUDE -I$d/AF/lib -I$d/AF"
+ V_OBJ_AUDIO="$V_OBJ_AUDIO audio-af.o"
fi
- if test ! -r $d/AF/lib/AF/AFlib.h ; then
- echo "can't find AFlib.h in $d/AF/lib/AF"
- exit 1
- fi
- V_LIB="$V_LIB $d/AF/lib/AF/libAF.a"
- V_INCLUDE="$V_INCLUDE -I$d/AF/lib -I$d/AF"
- V_OBJ_AUDIO="$V_OBJ_AUDIO audio-af.o"
else
echo "checking for AudioFile"
places="../AudioFile-3.1 \
@@ -150,6 +154,11 @@ sparc-sun-sunos*)
V_OBJ_AUDIO="$V_OBJ_AUDIO audio-voxware.o"
V_TARCMD="tar cfL"
V_CCOPT="-O2 -m486"
;;
+ ;;
+*-*-openbsd*)
+ V_OBJ_AUDIO="audio-voxware.o"
+ V_TARCMD="tar -h -c -f"
+ V_LIB="$V_LIB -lossaudio -L/usr/local/lib"
+ ;;
;;
*-*-freebsd*)
V_OBJ_AUDIO="$V_OBJ_AUDIO audio-voxware.o"
;;