1 --- mplayer-r29930/Makefile.orig 2009-11-19 12:35:34.062218530 +0100
2 +++ mplayer-r29930/Makefile 2009-11-19 12:37:01.221820848 +0100
7 -mencoder$(EXESUF): $(MENCODER_DEPS)
8 +SHARED_OBJS = $(sort $(OBJS_COMMON))
10 +libmplayer.so: $(SHARED_OBJS) $(COMMON_LIBS)
11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -avoid-version $^ $(EXTRALIBS) $(EXTRALIBS_MENCODER) $(EXTRALIBS_MPLAYER)
13 +mencoder$(EXESUF): $(OBJS_MENCODER) libmplayer.so
14 mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER)
15 -mplayer$(EXESUF): $(MPLAYER_DEPS)
16 +mplayer$(EXESUF): $(OBJS_MPLAYER) libmplayer.so
17 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
18 mencoder$(EXESUF) mplayer$(EXESUF):
19 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
20 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ libavutil/libavutil.a $(EXTRALIBS)
22 codec-cfg$(EXESUF): codec-cfg.c help_mp.h
23 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
26 TOOLS/netstream$(EXESUF): TOOLS/netstream.c
27 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
28 -TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
29 +TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) libmplayer.so
30 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
32 REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
33 --- mplayer-r29930/libavutil/mem.h.orig 2009-11-17 23:59:52.000000000 +0100
34 +++ mplayer-r29930/libavutil/mem.h 2009-11-19 12:37:44.429409470 +0100
36 #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
37 #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
38 #elif defined(__GNUC__)
39 - #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
40 + #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) __attribute__ ((visibility ("hidden")))
41 #define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used __attribute__ ((aligned (n)))
42 #elif defined(_MSC_VER)
43 #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v