openbsd-ports/x11/mplayer/patches/patch-configure

58 lines
1.5 KiB
Plaintext
Raw Normal View History

$OpenBSD: patch-configure,v 1.38 2006/07/19 21:40:47 robert Exp $
--- configure.orig Sun Jun 11 20:35:47 2006
+++ configure Sat Jul 8 16:12:25 2006
@@ -2970,7 +2970,7 @@
echores "$_rpath"
echocheck "iconv"
-if test "$_iconv" = auto ; then
+if test "$_iconv" != no ; then
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
@@ -4137,6 +4137,8 @@
_def_aa='#define HAVE_AA 1'
if cygwin ; then
_ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
+ else
+ _ld_aa="-laa"
fi
_vosrc="$_vosrc vo_aa.c"
_vomodules="aa $_vomodules"
@@ -5089,7 +5091,7 @@
2004-10-18 02:48:08 -04:00
echocheck "VCD support"
-if linux || bsdos || freebsd || netbsd || sunos || darwin ; then
+if linux || bsdos || freebsd || netbsd || sunos || darwin || openbsd ; then
2004-10-18 02:48:08 -04:00
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
_vcd="yes"
@@ -6723,7 +6725,7 @@
if test "$_tv" = yes ; then
cat > $TMPC <<EOF
#include <sys/types.h>
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <dev/ic/bt8xx.h>
#else
#include <machine/ioctl_bt848.h>
@@ -7453,7 +7455,7 @@
# audio output
ALSA_LIB = $_ld_alsa
NAS_LIB = $_ld_nas
-ARTS_LIB = $_ld_arts
+ARTS_LIB = $_ld_arts -lstdc++
ARTS_INC = $_inc_arts
ESD_LIB = $_ld_esd
ESD_INC = $_inc_esd
@@ -7764,7 +7766,7 @@
$_def_memalign
#ifndef HAVE_MEMALIGN
# define memalign(a,b) malloc(b)
-#define MEMALIGN_HACK 1
+/* #undef MEMALIGN_HACK 1 */
#endif
/* Define this if your system has the "alloca.h" header file */