- release 6 (libvpx 1.14)

[packages/mplayer.git] / mplayer-link.patch

diff --git a/mplayer-link.patch b/mplayer-link.patch
index d1ded48ec3f89999449949ad533c291d23f4cb17..330b5286841591722c37705889bc7e340ecfee15 100644 (file)
--- a/mplayer-link.patch
+++ b/mplayer-link.patch
@@ -1,11 +1,23 @@
---- mplayer-r31097/Makefile.orig       2010-11-28 14:02:59.000000000 +0100
-+++ mplayer-r31097/Makefile    2010-11-28 19:19:48.898402624 +0100
-@@ -740,7 +740,7 @@
- OBJS_MPLAYER   += $(OBJS_MPLAYER-yes)
+--- mplayer-r32669/Makefile.orig       2010-11-30 09:29:43.000000000 +0100
++++ mplayer-r32669/Makefile    2010-11-30 09:31:08.071501256 +0100
+@@ -687,7 +687,7 @@
+ OBJS_MPLAYER                  += $(OBJS_MPLAYER-yes)
  
  MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
 -MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(COMMON_LIBS)
 +MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(COMMON_LIBS) -lXext -lX11
- DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
+ DEP_FILES     = $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)
+ $(foreach suffix,.c .cpp .m .S,$(eval DEP_FILES := $(DEP_FILES:$(suffix)=.d)))
  
- ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
+--- mplayer-r32923/configure.orig      2011-06-28 21:37:44.000000000 +0200
++++ mplayer-r32923/configure   2011-06-28 21:39:56.738031684 +0200
+@@ -7869,7 +7869,7 @@
+   return exitvar;
+ }
+ EOF
+-      cc_check -lXext && _xshape=yes
++      cc_check -lXext -lX11 && _xshape=yes
+     fi
+     if test "$_xshape" = yes ; then
+       def_xshape='#define CONFIG_XSHAPE 1'
+