97df01c44d
changes: -bugfixes -support WebM container format -support Xv gamma adjustment -handle some more formats and Ogg tags many pkgsrc patches were integrated upstream
75 lines
2.4 KiB
Text
75 lines
2.4 KiB
Text
$NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
|
|
|
|
--- configure.ac.orig 2010-07-26 10:02:15.000000000 +0000
|
|
+++ configure.ac
|
|
@@ -581,6 +581,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
|
|
AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
|
|
AC_SUBST(NET_LIBS)
|
|
|
|
+WINE_LIBS=""
|
|
+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",)
|
|
+AC_SUBST(WINE_LIBS)
|
|
|
|
dnl ---------------------------------------------
|
|
dnl socklen_t
|
|
@@ -968,7 +971,6 @@ if test "x$enable_xinerama" != "xno"; th
|
|
])
|
|
if test "x$ac_have_xinerama" = "xyes"; then
|
|
AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
|
|
- X_LIBS="${X_LIBS} ${XINERAMA_LIBS}"
|
|
fi
|
|
else
|
|
ac_have_xinerama=no
|
|
@@ -1480,8 +1482,21 @@ AC_ARG_ENABLE([oss],
|
|
AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
|
|
|
|
if test "x$enable_oss" != "xno"; then
|
|
+
|
|
+ case "$host" in
|
|
+ *-*-netbsd*|*-*-openbsd*)
|
|
+ OSS_LIBS="-lossaudio"
|
|
+ ;;
|
|
+ *)
|
|
+ OSS_LIBS=""
|
|
+ ;;
|
|
+ esac
|
|
+
|
|
AC_CHECK_HEADERS([sys/soundcard.h machine/soundcard.h soundcard.h], [break])
|
|
AC_CHECK_DECL([SNDCTL_DSP_SETFRAGMENT], [have_ossaudio=yes], [], [
|
|
+ #ifdef __NetBSD__
|
|
+ #include <sys/ioctl.h>
|
|
+ #endif
|
|
#ifdef HAVE_SYS_SOUNDCARD_H
|
|
# include <sys/soundcard.h>
|
|
#endif
|
|
@@ -1499,6 +1514,7 @@ if test "x$enable_oss" != "xno"; then
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
|
|
+AC_SUBST(OSS_LIBS)
|
|
|
|
|
|
dnl ---------------------------------------------
|
|
@@ -1630,9 +1646,10 @@ AC_ARG_ENABLE([gnomevfs],
|
|
[with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
|
|
|
|
if test "x$with_gnome_vfs" = "xyes"; then
|
|
- PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
|
|
- no_gnome_vfs=no,
|
|
- no_gnome_vfs=yes)
|
|
+dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
|
|
+dnl no_gnome_vfs=no,
|
|
+dnl no_gnome_vfs=yes)
|
|
+no_gnome_vfs=yes
|
|
AC_SUBST(GNOME_VFS_CFLAGS)
|
|
AC_SUBST(GNOME_VFS_LIBS)
|
|
if test "x$no_gnome_vfs" != "xyes"; then
|
|
@@ -1973,7 +1990,7 @@ int has_timeout=sizeof(test.timeout);]])
|
|
AC_DEFINE([HAVE_WIN32_CDROM], [1],
|
|
[Define 1 if you have MinGW CD-ROM support])
|
|
;;
|
|
- freebsd4.*|kfreebsd*-gnu)
|
|
+ freebsd4.*|kfreebsd*-gnu|dragonfly*)
|
|
AC_DEFINE([HAVE_FREEBSD_CDROM], [1],
|
|
[Define 1 if you have FreeBSD CD-ROM support])
|
|
;;
|