Attachment #63172 for bug #73542

Lines 269-275 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/configure (-1 / +8 lines)
269	extralibs=""	269	extralibs=""
270	darwin="yes"	270	darwin="yes"
271	strip="strip -x"	271	strip="strip -x"
272	LDFLAGS="-Wl,-d,-search_paths_first"	272	LDFLAGS="-Wl,-dynamic,-search_paths_first"
		273	SLIBSUF=".dylib"
273	FFSLDFLAGS=-Wl,-bind_at_load	274	FFSLDFLAGS=-Wl,-bind_at_load
274	;;	275	;;
275	MINGW32*)	276	MINGW32*)
Lines 568-573 Link Here
568	needmdynamicnopic="yes"	568	needmdynamicnopic="yes"
569	fi	569	fi
570	;;	570	;;
		571	4.)
		572	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
		573	if test "$lshared" = no; then
		574	needmdynamicnopic="no"
		575	fi
		576	;;
571	*)	577	*)
572	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"	578	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
573	if test "$lshared" = no; then	579	if test "$lshared" = no; then

Lines 118-124 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/Makefile (-1 / +1 lines)
118	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)	118	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
119		119
120	ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs	120	ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
121	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)	121	$(CC) $(LDFLAGS) -bind_at_load -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
122		122
123	ffplay$(EXESUF): ffplay_g$(EXESUF)	123	ffplay$(EXESUF): ffplay_g$(EXESUF)
124	cp -p $< $@	124	cp -p $< $@

Lines 202-207 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/libavcodec/Makefile (-3 / +4 lines)
202		202
203	LIB= $(LIBPREF)avcodec$(LIBSUF)	203	LIB= $(LIBPREF)avcodec$(LIBSUF)
204	ifeq ($(BUILD_SHARED),yes)	204	ifeq ($(BUILD_SHARED),yes)
		205	SLIB_INSTALL=$(SLIBPREF)avcodec.0$(SLIBSUF)
205	SLIB= $(SLIBPREF)avcodec$(SLIBSUF)	206	SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
206	endif	207	endif
207	TESTS= imgresample-test dct-test motion-test fft-test	208	TESTS= imgresample-test dct-test motion-test fft-test
Lines 227-232 Link Here
227	-lib /machine:i386 /def:$(@:.dll=.def)	228	-lib /machine:i386 /def:$(@:.dll=.def)
228	else	229	else
229	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)	230	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
		231	ln -sf $(SLIB) $(SLIBPREF)avcodec.0$(SLIBSUF)
		232	ln -sf $(SLIB) $(SLIBPREF)avcodec$(SLIBSUF)
230	endif	233	endif
231		234
232	dsputil.o: dsputil.c dsputil.h	235	dsputil.o: dsputil.c dsputil.h
Lines 298-306 Link Here
298	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	301	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
299	else	302	else
300	install -d $(libdir)	303	install -d $(libdir)
301	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so	304	install -m 755 $(SLIB) $(libdir)/$(SLIB)
302	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
303	ldconfig \|\| true
304	endif	305	endif
305	ifeq ($(CONFIG_PP),yes)	306	ifeq ($(CONFIG_PP),yes)
306	$(MAKE) -C libpostproc $@	307	$(MAKE) -C libpostproc $@

Lines 27-33 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/libavcodec/a52dec.c (-1 / +1 lines)
27		27
28	#ifdef CONFIG_A52BIN	28	#ifdef CONFIG_A52BIN
29	#include <dlfcn.h>	29	#include <dlfcn.h>
30	static const char* liba52name = "liba52.so.0";	30	static const char* liba52name = "liba52.dylib.0";
31	#endif	31	#endif
32		32
33	/**	33	/**

Lines 40-46 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/libavcodec/faad.c (-1 / +1 lines)
40		40
41	#ifdef CONFIG_FAADBIN	41	#ifdef CONFIG_FAADBIN
42	#include <dlfcn.h>	42	#include <dlfcn.h>
43	static const char* libfaadname = "libfaad.so.0";	43	static const char* libfaadname = "libfaad.dylib.0";
44	#else	44	#else
45	#define dlopen(a)	45	#define dlopen(a)
46	#define dlclose(a)	46	#define dlclose(a)

Lines 4-10 Link Here

(-)../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile (-5 / +19 lines)
4	VPATH=$(SRC_PATH)/libavcodec/libpostproc	4	VPATH=$(SRC_PATH)/libavcodec/libpostproc
5		5
6	ifeq ($(SHARED_PP),yes)	6	ifeq ($(SHARED_PP),yes)
7	SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)	7	ifeq ($(CONFIG_DARWIN),yes)
		8	SPPLIB = $(SLIBPREF)postproc
		9	else
		10	SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
		11	endif
8	SPPVERSION = 0.0.1	12	SPPVERSION = 0.0.1
9	endif	13	endif
10	PPLIB = $(LIBPREF)postproc$(LIBSUF)	14	PPLIB = $(LIBPREF)postproc$(LIBSUF)
Lines 25-34 Link Here
25	all: $(SWSLIB) $(PPLIB) $(SPPLIB)	29	all: $(SWSLIB) $(PPLIB) $(SPPLIB)
26		30
27	clean:	31	clean:
28	rm -f .o .a ~ .so $(PPLIB) $(SPPLIB)	32	rm -f .o .a ~ .$(SLIBSUF) $(PPLIB) $(SPPLIB)
29		33
30	distclean:	34	distclean:
31	rm -f Makefile.bak .o .a ~ .so .depend	35	rm -f Makefile.bak .o .a ~ .$(SLIBSUF) .depend
32		36
33	dep: depend	37	dep: depend
34		38
Lines 40-48 Link Here
40	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<	44	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
41		45
42	$(SPPLIB): $(SPPOBJS)	46	$(SPPLIB): $(SPPOBJS)
		47	ifeq ($(CONFIG_DARWIN),yes)
		48	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
		49	-o $(SPPLIB).dylib $(SPPOBJS)
		50	else
43	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \	51	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
44	-o $(SPPLIB) $(SPPOBJS)	52	-o $(SPPLIB) $(SPPOBJS)
45	endif	53	endif
		54	endif
46		55
47	$(PPLIB): $(PPOBJS)	56	$(PPLIB): $(PPOBJS)
48	rm -f $@	57	rm -f $@
Lines 55-62 Link Here
55	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"	64	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
56	else	65	else
57	install -d $(libdir)	66	install -d $(libdir)
58	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)	67	ifeq ($(CONFIG_DARWIN),yes)
59	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)	68	install -m 755 $(SPPLIB)$(SLIBSUF) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)$(SLIBSUF)
		69	ln -sf $(SPPLIB).$(SPPVERSION)$(SLIBSUF) $(prefix)/lib/$(SPPLIB)$(SLIBSUF)
		70	else
		71	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
		72	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
		73	endif
60	ldconfig \|\| true	74	ldconfig \|\| true
61	endif	75	endif
62	endif	76	endif





LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB_INSTALL=$(SLIBPREF)avformat.0$(SLIBSUF)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
endif


	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
else
	install -d $(libdir)
	install -m 755 $(SLIB) $(libdir)/$(SLIB)
	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
	ldconfig || true
endif
else
install:

Lines 5-11 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/vhook/Makefile (-2 / +3 lines)
5	CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H	5	CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
6		6
7	ifeq ($(CONFIG_DARWIN),yes)	7	ifeq ($(CONFIG_DARWIN),yes)
8	SHFLAGS+=-flat_namespace -undefined suppress	8	SHFLAGS=-bundle -avoid-version -undefined dynamic_lookup
		9	MACOSX_DEPLOYMENT_TARGET=10.3
9	endif	10	endif
10	HOOKS=null.so fish.so ppm.so watermark.so	11	HOOKS=null.so fish.so ppm.so watermark.so
11		12
Lines 36-42 Link Here
36	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`	36	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
37		37
38	%.so: %.o	38	%.so: %.o
39	$(CC) -g -o $@ $(SHFLAGS) $<	39	$(CC) -g -o $@ $(SHFLAGS) $< -L../libavcodec -lavcodec -L../libavformat -lavformat
40		40
41	clean:	41	clean:
42	rm -f .o .d .depend .so ~	42	rm -f .o .d .depend .so ~

Return to bug 73542

Lines 79-84 Link Here

(-)ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile (-3 / +2 lines)
79		79
80	LIB= $(LIBPREF)avformat$(LIBSUF)	80	LIB= $(LIBPREF)avformat$(LIBSUF)
81	ifeq ($(BUILD_SHARED),yes)	81	ifeq ($(BUILD_SHARED),yes)
		82	SLIB_INSTALL=$(SLIBPREF)avformat.0$(SLIBSUF)
82	SLIB= $(SLIBPREF)avformat$(SLIBSUF)	83	SLIB= $(SLIBPREF)avformat$(SLIBSUF)
83	endif	84	endif
84		85
Lines 113-121 Link Here
113	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	114	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
114	else	115	else
115	install -d $(libdir)	116	install -d $(libdir)
116	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so	117	install -m 755 $(SLIB) $(libdir)/$(SLIB)
117	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
118	ldconfig \|\| true
119	endif	118	endif
120	else	119	else
121	install:	120	install: