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

--- mplayer-r29930/Makefile.orig	2009-11-19 12:35:34.062218530 +0100
+++ mplayer-r29930/Makefile	2009-11-19 12:37:01.221820848 +0100
@@ -833,12 +833,17 @@
 	$(MAKE) -C $(@D)
 	touch $@
 
-mencoder$(EXESUF): $(MENCODER_DEPS)
+SHARED_OBJS = $(sort $(OBJS_COMMON))
+
+libmplayer.so: $(SHARED_OBJS) $(COMMON_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -avoid-version $^ $(EXTRALIBS) $(EXTRALIBS_MENCODER) $(EXTRALIBS_MPLAYER)
+
+mencoder$(EXESUF): $(OBJS_MENCODER) libmplayer.so
 mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER)
-mplayer$(EXESUF): $(MPLAYER_DEPS)
+mplayer$(EXESUF): $(OBJS_MPLAYER) libmplayer.so
 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
 mencoder$(EXESUF) mplayer$(EXESUF):
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ libavutil/libavutil.a $(EXTRALIBS)
 
 codec-cfg$(EXESUF): codec-cfg.c help_mp.h
 	$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
@@ -1044,7 +1049,7 @@
 
 TOOLS/netstream$(EXESUF): TOOLS/netstream.c
 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
-TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
+TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) libmplayer.so
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
 
 REAL_SRCS    = $(wildcard TOOLS/realcodecs/*.c)
--- mplayer-r29930/libavutil/mem.h.orig	2009-11-17 23:59:52.000000000 +0100
+++ mplayer-r29930/libavutil/mem.h	2009-11-19 12:37:44.429409470 +0100
@@ -32,7 +32,7 @@
     #define DECLARE_ALIGNED(n,t,v)      t v __attribute__ ((aligned (n)))
     #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
 #elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t v __attribute__ ((aligned (n)))
+    #define DECLARE_ALIGNED(n,t,v)      t v __attribute__ ((aligned (n)))  __attribute__ ((visibility ("hidden")))
     #define DECLARE_ASM_CONST(n,t,v)    static const t v attribute_used __attribute__ ((aligned (n)))
 #elif defined(_MSC_VER)
     #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
Commit	Line	Data
043c371f	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
	3	@@ -833,12 +833,17 @@
	4	$(MAKE) -C $(@D)
	5	touch $@
3653621f	6
043c371f	7	-mencoder$(EXESUF): $(MENCODER_DEPS)
043c371f	8	+SHARED_OBJS = $(sort $(OBJS_COMMON))
3653621f	9	+
043c371f	10	+libmplayer.so: $(SHARED_OBJS) $(COMMON_LIBS)
043c371f	11	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -avoid-version $^ $(EXTRALIBS) $(EXTRALIBS_MENCODER) $(EXTRALIBS_MPLAYER)
3653621f	12	+
043c371f	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)
3653621f	21
043c371f	22	codec-cfg$(EXESUF): codec-cfg.c help_mp.h
	23	$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
	24	@@ -1044,7 +1049,7 @@
3653621f	25
043c371f	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)
3653621f	31
043c371f	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
	35	@@ -32,7 +32,7 @@
	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