A small tweak so that the XviD test succeeds. Touches some autoconf m4

files...

4 files changed, 39 insertions, 4 deletions

diff --git a/graphics/xine-lib/distinfo b/graphics/xine-lib/distinfo
index 0a65bf25c37..620f310ee21 100644
--- a/graphics/xine-lib/distinfo
+++ b/graphics/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/10/05 09:27:13 mycroft Exp $
+$NetBSD: distinfo,v 1.12 2003/10/06 04:52:06 mycroft Exp $
 
 SHA1 (xine-lib-1-rc0a.tar.gz) = ee41ba602179a9f02208a15e3dff36a1dfa00fac
 Size (xine-lib-1-rc0a.tar.gz) = 4211552 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 4da2e4cdcb0f0f5273eae4caa196c06e3ae6064b
 SHA1 (patch-ac) = df25d862f84de5221d722f9415a201986dc5d952
 SHA1 (patch-ad) = ed65116acfa1f32a0508338a11567589bc2b4123
 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
-SHA1 (patch-ag) = 8ba90809f2f68c6fd278a662ba820ecb3cd8552d
+SHA1 (patch-ag) = 132a8db657ce0bc3ac9e74560aae9054996fa57e
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
 SHA1 (patch-aj) = 54cf69b028d46327d46b5cc2a0ec457bd4a59b67
diff --git a/graphics/xine-lib/patches/disabled-patch-ab b/graphics/xine-lib/patches/disabled-patch-ab
new file mode 100644
index 00000000000..a4cd91af63c
--- /dev/null
+++ b/graphics/xine-lib/patches/disabled-patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: disabled-patch-ab,v 1.1 2003/10/06 04:52:06 mycroft Exp $
+
+--- aclocal.m4.orig	2003-08-02 13:49:37.000000000 +0000
++++ aclocal.m4	2003-10-06 04:36:36.000000000 +0000
+@@ -6620,7 +6620,7 @@
+     XVID_LIBS="-L$xvid_prefix/lib"
+   fi
+ 
+-  XVID_LIBS="$XVID_LIBS -lxvidcore"
++  XVID_LIBS="$XVID_LIBS -lxvidcore -lm"
+ 
+   AC_MSG_CHECKING(for XviD)
+   no_xvid=""
diff --git a/graphics/xine-lib/patches/disabled-patch-ac b/graphics/xine-lib/patches/disabled-patch-ac
new file mode 100644
index 00000000000..40ac539d8be
--- /dev/null
+++ b/graphics/xine-lib/patches/disabled-patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: disabled-patch-ac,v 1.1 2003/10/06 04:52:06 mycroft Exp $
+
+--- xvid.m4.orig	2003-07-13 19:29:04.000000000 +0000
++++ xvid.m4	2003-10-06 04:44:40.000000000 +0000
+@@ -18,7 +18,7 @@
+     XVID_LIBS="-L$xvid_prefix/lib"
+   fi
+ 
+-  XVID_LIBS="$XVID_LIBS -lxvidcore"
++  XVID_LIBS="$XVID_LIBS -lxvidcore -lm"
+ 
+   AC_MSG_CHECKING(for XviD)
+   no_xvid=""
diff --git a/graphics/xine-lib/patches/patch-ag b/graphics/xine-lib/patches/patch-ag
index ea437b2d986..93a5881c07c 100644
--- a/graphics/xine-lib/patches/patch-ag
+++ b/graphics/xine-lib/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.4 2003/10/05 09:27:13 mycroft Exp $
+$NetBSD: patch-ag,v 1.5 2003/10/06 04:52:06 mycroft Exp $
 
 --- configure.orig	2003-08-02 13:50:43.000000000 +0000
-+++ configure	2003-10-05 09:10:21.000000000 +0000
++++ configure	2003-10-06 04:36:21.000000000 +0000
 @@ -467,7 +467,7 @@
  # include <unistd.h>
  #endif"
@@ -134,6 +134,15 @@ $NetBSD: patch-ag,v 1.4 2003/10/05 09:27:13 mycroft Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_XINERAMA 1
+@@ -18624,7 +18683,7 @@
+     XVID_LIBS="-L$xvid_prefix/lib"
+   fi
+ 
+-  XVID_LIBS="$XVID_LIBS -lxvidcore"
++  XVID_LIBS="$XVID_LIBS -lxvidcore -lm"
+ 
+   echo "$as_me:$LINENO: checking for XviD" >&5
+ echo $ECHO_N "checking for XviD... $ECHO_C" >&6
 @@ -20505,102 +20564,7 @@
  fi