summaryrefslogtreecommitdiff
path: root/multimedia/xine-lib/patches/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/xine-lib/patches/patch-ag')
-rw-r--r--multimedia/xine-lib/patches/patch-ag87
1 files changed, 48 insertions, 39 deletions
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 6956457c1b9..1a342c467d5 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
+$NetBSD: patch-ag,v 1.16 2007/06/15 18:20:06 drochner Exp $
---- configure.ac.orig 2007-01-28 18:17:56.000000000 +0100
+--- configure.ac.orig 2007-04-08 18:31:32.000000000 +0200
+++ configure.ac
-@@ -220,7 +220,7 @@ AC_ARG_WITH(pthread-prefix,
- [pthread_prefix="no"])
+@@ -98,7 +98,7 @@ dnl ------------------------------------
+ AC_CANONICAL_HOST
+ AC_CANONICAL_BUILD
- case "$host" in
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
- if test "x$pthread_prefix" = "xno"; then
- pthread_prefix="/usr/local"
- fi
-@@ -584,6 +584,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+-test "$host" == "$build" && check_athlon=yes
++test "$host" = "$build" && check_athlon=yes
+
+ AC_CONFIG_HEADERS([config.h])
+
+@@ -549,6 +549,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
AC_SUBST(NET_LIBS)
@@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
dnl ---------------------------------------------
dnl socklen_t
-@@ -774,7 +777,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
+@@ -739,7 +742,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
AC_MSG_RESULT()
dnl Check if vld "extended" XvMC is available
@@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
ac_have_xxmc="yes",
[ac_have_xxmc="no"
-@@ -804,7 +807,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
+@@ -769,7 +772,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
fi
dnl Try fallback to standard XvMC if vld failed
if test "x$ac_have_xxmc" = "xno"; then
@@ -39,7 +39,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
ac_have_xxmc="yes",
[ac_have_xxmc="no"
-@@ -858,7 +861,7 @@ saved_libs="$LIBS"
+@@ -823,7 +826,7 @@ saved_libs="$LIBS"
XVMC_LIBS="-L$xvmc_path -l$xvmc_stub"
AC_MSG_CHECKING(whether to enable the xvmc plugin)
AC_MSG_RESULT()
@@ -48,7 +48,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
ac_have_xvmc="yes",
[ac_have_xvmc="no"
-@@ -909,7 +912,6 @@ if test "x$enable_xinerama" != "xno"; th
+@@ -914,7 +917,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])
@@ -56,37 +56,37 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
fi
else
ac_have_xinerama=no
-@@ -1422,10 +1424,21 @@ AC_ARG_ENABLE([oss],
- [with_oss=$enableval], [with_oss=yes])
+@@ -1416,8 +1418,21 @@ AC_ARG_ENABLE([oss],
+ AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
- if test "x$with_oss" = "xyes"; then
+ if test "x$enable_oss" != "xno"; then
++
++ case "$host" in
++ *-*-netbsd*|*-*-openbsd*)
++ OSS_LIBS="-lossaudio"
++ ;;
++ *)
++ OSS_LIBS=""
++ ;;
++ esac
+
-+ case "$host" in
-+ *-*-netbsd*|*-*-openbsd*)
-+ OSS_LIBS="-lossaudio"
-+ ;;
-+ *)
-+ OSS_LIBS=""
-+ ;;
-+ esac
-+
- AC_MSG_CHECKING(for OSS audio support)
- have_ossaudio=no
- AC_TRY_COMPILE([
- #ifdef __NetBSD__
-+ #include <sys/ioctl.h>
- #include <soundcard.h>
- #else
- #include <sys/soundcard.h>
-@@ -1440,6 +1453,7 @@ else
- have_ossaudio=no
+ 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
+@@ -1433,6 +1448,7 @@ if test "x$enable_oss" != "xno"; then
fi
+
AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
+AC_SUBST(OSS_LIBS)
dnl ---------------------------------------------
-@@ -1565,9 +1579,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1542,9 +1558,10 @@ AC_ARG_ENABLE([gnomevfs],
[with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
if test "x$with_gnome_vfs" = "xyes"; then
@@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
AC_SUBST(GNOME_VFS_CFLAGS)
AC_SUBST(GNOME_VFS_LIBS)
if test "x$no_gnome_vfs" != "xyes"; then
-@@ -1913,7 +1928,7 @@ int has_timeout=sizeof(test.timeout);],
+@@ -1879,7 +1896,7 @@ int has_timeout=sizeof(test.timeout);]])
AC_DEFINE([HAVE_WIN32_CDROM], [1],
[Define 1 if you have MinGW CD-ROM support])
;;
@@ -109,3 +109,12 @@ $NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
AC_DEFINE([HAVE_FREEBSD_CDROM], [1],
[Define 1 if you have FreeBSD CD-ROM support])
;;
+@@ -2574,7 +2591,7 @@ case $host in
+ dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
+ dnl are requested, as different implementations are present; to avoid problems
+ dnl use -Wl,-z,defs only for those platform not behaving this way.
+- *-freebsd*) ;;
++ *-freebsd* | *-netbsd*) ;;
+ *)
+ AC_TRY_LDFLAGS([-Wl,-z,defs], [NOUNDEF="-Wl,-z,defs"])
+ ;;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 22:26:00 +0000