* All Debian packages are now lintian-clean.

  * Fixed XVideo plugin linking.

diff --git a/ChangeLog b/ChangeLog
index 141f760d3c058da82e4f3f63f3c5ba21e21355e7..8870e0c58083815bcb7cf3e10d5125df28b88544 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 HEAD
 
+  * All Debian packages are now lintian-clean.
+  * Fixed XVideo plugin linking.
   * Updated TODO list.
   * Built-in modules support almost finished.
   * A few Makefile fixes for BeOS.

diff --git a/configure b/configure
index 6770a22250ff482a122a58f77302b15961490245..be0cd4be75ebf0f021f8f87e1748321c3ab4d014 100755 (executable)
--- a/configure
+++ b/configure
@@ -3628,7 +3628,7 @@ if test "${enable_xvideo+set}" = set; then
   enableval="$enable_xvideo"
   if test x$enable_xvideo = xyes; then
      PLUGINS=${PLUGINS}"xvideo "
-     LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext"
+     LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext -lXv"
    fi
 fi
 

diff --git a/configure.in b/configure.in
index ff06849ab4d7e89f71d442fe7b6e39e38544dd98..d4fc31d1beeae3e9af021037f6ab158e4ec02389 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -392,7 +392,7 @@ AC_ARG_ENABLE(xvideo,
   [  --enable-xvideo         XVideo interface support (default disabled)],
   [if test x$enable_xvideo = xyes; then
      PLUGINS=${PLUGINS}"xvideo "
-     LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext"
+     LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext -lXv"
    fi])
 
 dnl

diff --git a/debian/rules b/debian/rules
index 27202519d2762bc3f42efba1d334ebf89689ef1a..4a165b45d7c3f24f6e28214b0105367707f1cff7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -49,9 +49,6 @@ install: build
 
        DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
 
-       # remove the yuvmmx plugin, it doesn't like -fPIC
-       rm debian/vlc/usr/lib/videolan/vlc/yuvmmx.so
-
        # make symlinks for packages
        aliases="ggi gtk gnome esd sdl alsa qt" ; \
        if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \