# HG changeset patch # User rfelker # Date 1124479470 0 # Node ID 414ece37801b67d9d8e87a141725e1de64a1b2a5 # Parent 7fb03699efd938a9f619ee30c6d98644de152532 remove broken shared libpostproc stuff diff -r 7fb03699efd9 -r 414ece37801b Makefile --- a/Makefile Fri Aug 19 15:10:23 2005 +0000 +++ b/Makefile Fri Aug 19 19:24:30 2005 +0000 @@ -257,11 +257,6 @@ endif endif -ifeq ($(SHARED_PP),yes) -COMMON_DEPS += libavcodec/libpostproc/libpostproc.so -COMMON_LIBS += libavcodec/libpostproc/libpostproc.so -endif - ifeq ($(GUI),yes) COMMON_DEPS += Gui/libgui.a GUI_LIBS = Gui/libgui.a @@ -450,9 +445,6 @@ ifeq ($(VIDIX),yes) $(DO_MAKE) endif -ifeq ($(SHARED_PP),yes) - $(MAKE) install -C libavcodec/libpostproc -endif if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) ifeq ($(GUI),yes) diff -r 7fb03699efd9 -r 414ece37801b configure --- a/configure Fri Aug 19 15:10:23 2005 +0000 +++ b/configure Fri Aug 19 19:24:30 2005 +0000 @@ -307,7 +307,6 @@ and GUI (also the environment variable \$LINGUAS is honored) [en] (Available: $LANGUAGES all) - --enable-shared-pp install & use shared postprocessing lib --with-install=PATH use a custom install program (useful if your OS uses a GNU-incompatible install utility by default and you want to use GNU version) @@ -1464,7 +1463,6 @@ _big_endian=auto _freetype=auto _fontconfig=auto -_shared_pp=no _menu=no _qtx=auto _macosx=auto @@ -1755,9 +1753,6 @@ --enable-dga=*) _dga=`echo $ac_option | cut -d '=' -f 2` ;; --disable-dga) _dga=no ;; - --enable-shared-pp) _shared_pp=yes ;; - --disable-shared-pp) _shared_pp=no ;; - --enable-menu) _menu=yes ;; --disable-menu) _menu=no ;; @@ -6482,9 +6477,6 @@ fi echores "$_byte_order" -echocheck "shared postprocess lib" -echores "$_shared_pp" - echocheck "OSD menu" if test "$_menu" = yes ; then _def_menu='#define HAVE_MENU 1' @@ -6967,7 +6959,6 @@ MPLAYER_NETWORK_LIB = $_ld_live $_ld_vstream $_ld_network DVBIN = $_dvbin VIDIX = $_vidix -SHARED_PP = $_shared_pp CONFIG_PP = yes CONFIG_RISKY = yes CONFIG_MP3LAME = $_mp3lame