Be more selective about linking things with -lXinerama -- only the DXR3 module

actually uses it.

6 files changed, 77 insertions, 10 deletions

diff --git a/graphics/xine-lib/PLIST b/graphics/xine-lib/PLIST
index 7c11111a3c0..1bb2782da3b 100644
--- a/graphics/xine-lib/PLIST
+++ b/graphics/xine-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/05 09:58:36 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/10/05 09:27:13 mycroft Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -209,8 +209,11 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_none.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.a
 lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.a
+lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.a
+lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a
+lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
 man/man1/xine-config.1
 share/aclocal/xine.m4
 share/doc/xine/README
diff --git a/graphics/xine-lib/distinfo b/graphics/xine-lib/distinfo
index 47b20620e61..0a65bf25c37 100644
--- a/graphics/xine-lib/distinfo
+++ b/graphics/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/10/03 17:49:27 mycroft Exp $
+$NetBSD: distinfo,v 1.11 2003/10/05 09:27:13 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) = 725e79350e2c0dc6312bda9d51dd3f185449abff
+SHA1 (patch-ag) = 8ba90809f2f68c6fd278a662ba820ecb3cd8552d
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
 SHA1 (patch-aj) = 54cf69b028d46327d46b5cc2a0ec457bd4a59b67
@@ -16,3 +16,5 @@ SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99
 SHA1 (patch-am) = 0441dcd9faf0c0e7f07c8d0fc7a61fcce435af76
 SHA1 (patch-an) = 4877ff4f905c2b62c37c0d4bbb51510d8a043344
 SHA1 (patch-ao) = 53de6febfed214e9e43d53e3e5b83af1fcb19b20
+SHA1 (patch-ap) = 7bb70f8d5cee7787e831649cb746d21000a357fc
+SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded
diff --git a/graphics/xine-lib/patches/disabled-patch-aa b/graphics/xine-lib/patches/disabled-patch-aa
index 87e09888c1e..f4de1f9dd12 100644
--- a/graphics/xine-lib/patches/disabled-patch-aa
+++ b/graphics/xine-lib/patches/disabled-patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: disabled-patch-aa,v 1.1 2003/10/02 14:20:35 mycroft Exp $
+$NetBSD: disabled-patch-aa,v 1.2 2003/10/05 09:27:13 mycroft Exp $
 
 --- configure.ac.orig	2003-08-02 11:45:26.000000000 +0000
-+++ configure.ac	2003-10-02 13:03:11.000000000 +0000
++++ configure.ac	2003-10-05 09:10:13.000000000 +0000
 @@ -301,6 +301,9 @@
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
@@ -30,7 +30,17 @@ $NetBSD: disabled-patch-aa,v 1.1 2003/10/02 14:20:35 mycroft Exp $
  AC_SUBST(OPENGL_LIBS)
  AC_SUBST(GLUT_LIBS)
  AC_SUBST(GLU_LIBS)
-@@ -761,9 +764,10 @@
+@@ -456,8 +459,7 @@
+ dnl ---------------------------------------------
+ 
+ AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
+-             [X_LIBS="$X_LIBS -lXinerama"
+-              AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
++             [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
+               ac_have_xinerama="yes"],,
+              [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
+ AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
+@@ -761,9 +763,10 @@
  dnl ---------------------------------------------
  dnl gnome-vfs support
  dnl ---------------------------------------------
diff --git a/graphics/xine-lib/patches/patch-ag b/graphics/xine-lib/patches/patch-ag
index b4275660ec2..ea437b2d986 100644
--- a/graphics/xine-lib/patches/patch-ag
+++ b/graphics/xine-lib/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2003/10/02 14:20:35 mycroft Exp $
+$NetBSD: patch-ag,v 1.4 2003/10/05 09:27:13 mycroft Exp $
 
 --- configure.orig	2003-08-02 13:50:43.000000000 +0000
-+++ configure	2003-10-02 13:03:23.000000000 +0000
++++ configure	2003-10-05 09:10:21.000000000 +0000
 @@ -467,7 +467,7 @@
  # include <unistd.h>
  #endif"
@@ -126,7 +126,15 @@ $NetBSD: patch-ag,v 1.3 2003/10/02 14:20:35 mycroft Exp $
  	       echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then
-@@ -20505,102 +20565,7 @@
+@@ -15265,7 +15325,6 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
+ if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
+-  X_LIBS="$X_LIBS -lXinerama"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_XINERAMA 1
+@@ -20505,102 +20564,7 @@
  fi
  
  
@@ -230,7 +238,7 @@ $NetBSD: patch-ag,v 1.3 2003/10/02 14:20:35 mycroft Exp $
  
  
  if test x"$no_gnome_vfs" != "xyes"; then
-@@ -24379,6 +24344,7 @@
+@@ -24379,6 +24343,7 @@
  s,@HAVE_NVTV_TRUE@,$HAVE_NVTV_TRUE,;t t
  s,@HAVE_NVTV_FALSE@,$HAVE_NVTV_FALSE,;t t
  s,@NET_LIBS@,$NET_LIBS,;t t
diff --git a/graphics/xine-lib/patches/patch-ap b/graphics/xine-lib/patches/patch-ap
new file mode 100644
index 00000000000..6b742d520cf
--- /dev/null
+++ b/graphics/xine-lib/patches/patch-ap
@@ -0,0 +1,23 @@
+$NetBSD: patch-ap,v 1.1 2003/10/05 09:27:13 mycroft Exp $
+
+--- src/dxr3/Makefile.am.orig	2003-07-13 19:29:04.000000000 +0000
++++ src/dxr3/Makefile.am	2003-10-05 09:04:21.000000000 +0000
+@@ -18,6 +18,9 @@
+ if HAVE_LIBRTE
+ link_rte = -lrte
+ endif
++if HAVE_XINERAMA
++link_xinerama = -lXinerama
++endif
+ 
+ lib_LTLIBRARIES = $(dxr3_modules) 
+ 
+@@ -42,7 +45,7 @@
+ 	dxr3_spu_encoder.c \
+ 	video_out_dxr3.c 
+ 
+-xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
++xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB)
+ xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
+ 
+ noinst_HEADERS = \
diff --git a/graphics/xine-lib/patches/patch-aq b/graphics/xine-lib/patches/patch-aq
new file mode 100644
index 00000000000..fc4b99fa07c
--- /dev/null
+++ b/graphics/xine-lib/patches/patch-aq
@@ -0,0 +1,21 @@
+$NetBSD: patch-aq,v 1.1 2003/10/05 09:27:13 mycroft Exp $
+
+--- src/dxr3/Makefile.in.orig	2003-08-02 13:50:11.000000000 +0000
++++ src/dxr3/Makefile.in	2003-10-05 09:05:25.000000000 +0000
+@@ -235,6 +235,7 @@
+ @HAVE_X11_TRUE@link_x_libs = $(X_LIBS) -lXext
+ @HAVE_LIBFAME_TRUE@link_fame = $(LIBFAME_LIBS)
+ @HAVE_LIBRTE_TRUE@link_rte = -lrte
++@HAVE_XINERAMA_TRUE@link_xinerama = -lXinerama
+ 
+ lib_LTLIBRARIES = $(dxr3_modules) 
+ 
+@@ -257,7 +258,7 @@
+ 	video_out_dxr3.c 
+ 
+ 
+-xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
++xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB)
+ xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
+ 
+ noinst_HEADERS = \