[MPlayer-dev-eng] [PATCH] X264_* & X264_* vars broken

[Derek E. Lewis]

Users who install XviD or x264 into non-default locations will experience 
broken builds when building libavcodec/, as ffmpeg does not use XVID_INC, 
XVID_LIB, X264_INC, and X264_LIB.  XVID_INC and friends are specified 
using --with-xvid* --with-x264*, giving a user an impulse to use those 
configure options over --with-extra*.  I've relocated the homes of 
$_ld_x264 and $_ld_xvid to EXTRA_LIBS.

We may consider to remove all instances of *_INC and *_LIB in the future, 
as it leaves too much room for inconsistency between MPlayer and ffmpeg.

Derek E. Lewis
dlewis at solnetworks.net
http://riemann.solnetworks.net/~dlewis
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.351
diff -u -r1.351 Makefile
--- Makefile	22 Mar 2006 00:19:00 -0000	1.351
+++ Makefile	22 Mar 2006 20:51:10 -0000
@@ -97,14 +97,12 @@
              $(FAAD_LIB) \
              $(LIBLZO_LIB) \
              $(DECORE_LIB) \
-             $(XVID_LIB) \
              $(DTS_LIB) \
              $(PNG_LIB) \
              $(Z_LIB) \
              $(JPEG_LIB) \
              $(ALSA_LIB) \
              $(XMMS_LIB) \
-             $(X264_LIB) \
              $(MUSEPACK_LIB) \
              $(SPEEX_LIB) \
 
@@ -141,7 +139,6 @@
          $(FRIBIDI_INC) \
          $(SDL_INC) \
          $(X11_INC) \
-         $(XVID_INC) \
          $(LIBAV_INC) \
          $(LIBCDIO_INC) \
 
-------------- next part --------------
Index: libmpcodecs/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.161
diff -u -r1.161 Makefile
--- libmpcodecs/Makefile	16 Mar 2006 21:56:23 -0000	1.161
+++ libmpcodecs/Makefile	22 Mar 2006 20:51:34 -0000
@@ -272,8 +272,6 @@
           -I../loader \
           $(LIBAV_INC) \
           $(EXTRA_INC) \
-          $(X264_INC) \
-          $(XVID_INC) \
           -D_GNU_SOURCE \
 
 .SUFFIXES: .c .o
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1149
diff -u -r1.1149 configure
--- configure	21 Mar 2006 05:36:09 -0000	1.1149
+++ configure	22 Mar 2006 20:50:49 -0000
@@ -381,10 +381,6 @@
   --with-win32libdir=DIR   W*ndows DLL files in DIR
   --with-xanimlibdir=DIR   XAnim DLL files in DIR
   --with-reallibdir=DIR    RealPlayer DLL files in DIR
-  --with-xvidlibdir=DIR    libxvidcore (XviD) in DIR  (*)
-  --with-xvidincdir=DIR    XviD header in DIR (*)
-  --with-x264libdir=DIR    libx264 in DIR
-  --with-x264incdir=DIR    x264 header in DIR
   --with-dtslibdir=DIR     libdts library in DIR  (*)
   --with-dtsincdir=DIR     libdts header in DIR (*)
   --with-livelibdir=DIR    LIVE555 Streaming Media libraries in DIR
@@ -2028,24 +2024,12 @@
   --with-dvbincdir=*)
     _inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
-  --with-xvidlibdir=*)
-    _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-    ;;
-  --with-xvidincdir=*)
-    _inc_xvid=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-    ;;
   --with-dtslibdir=*)
     _ld_libdts=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
     ;;
   --with-dtsincdir=*)
     _inc_libdts=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
-  --with-x264libdir=*)
-    _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-    ;;
-  --with-x264incdir=*)
-    _inc_x264=-I`echo $ac_option | cut -d '=' -f 2 |sed 's,:, -I,g'`
-    ;;
   --with-sdl-config=*)
     _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -7267,7 +7251,7 @@
 JPEG = $_mkf_jpg
 GIF = $_mkf_gif
 
-EXTRA_LIB = $_ld_extra
+EXTRA_LIB = $_ld_extra $_ld_xvid $_ld_x264
 Z_LIB =  $_ld_static $_ld_zlib
 HAVE_MLIB = $_mlib
 WIN32_LIB = $_ld_win32libs
@@ -7351,11 +7335,7 @@
 MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv
 XVID = $_xvid
-XVID_INC = $_inc_xvid
-XVID_LIB = $_ld_xvid
 X264 = $_x264
-X264_INC = $_inc_x264
-X264_LIB = $_ld_x264
 CONFIG_DTS = $_libdts
 DTS_INC = $_inc_libdts
 DTS_LIB = $_ld_libdts