Attachment #55718 for bug #73542

Lines 240-246 Link Here

(-)../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg-0.4.9-pre1/configure (-2 / +3 lines)
240	make="gmake"	240	make="gmake"
241	;;	241	;;
242	Darwin)	242	Darwin)
243	cc="cc"	243	cc="gcc"
244	v4l="no"	244	v4l="no"
245	audio_oss="no"	245	audio_oss="no"
246	dv1394="no"	246	dv1394="no"
Lines 249-255 Link Here
249	extralibs=""	249	extralibs=""
250	darwin="yes"	250	darwin="yes"
251	strip="strip -x"	251	strip="strip -x"
252	LDFLAGS="-Wl,-d"	252	LDFLAGS="-Wl,-dynamic"
		253	SLIBSUF=".dylib"
253	FFSLDFLAGS=-Wl,-bind_at_load	254	FFSLDFLAGS=-Wl,-bind_at_load
254	;;	255	;;
255	MINGW32*)	256	MINGW32*)

Lines 217-223 Link Here

(-)../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg-0.4.9-pre1/libavcodec/Makefile (-3 / +3 lines)
217	dep: depend	217	dep: depend
218		218
219	clean: $(CLEANAMR)	219	clean: $(CLEANAMR)
220	rm -f .o .d ~ .depend $(LIB) $(SLIB) .so i386/.o i386/~ \	220	rm -f .o .d ~ .depend $(LIB) $(SLIB) .dylib .so i386/.o i386/*~ \
221	armv4l/.o armv4l/~ \	221	armv4l/.o armv4l/~ \
222	mlib/.o mlib/~ \	222	mlib/.o mlib/~ \
223	alpha/.o alpha/~ \	223	alpha/.o alpha/~ \
Lines 269-276 Link Here
269	install -s -m 755 $(SLIB) "$(prefix)"	269	install -s -m 755 $(SLIB) "$(prefix)"
270	else	270	else
271	install -d $(prefix)/lib	271	install -d $(prefix)/lib
272	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so	272	install -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION)$(SLIBSUF)
273	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so	273	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(prefix)/lib/libavcodec$(SLIBSUF)
274	ldconfig \|\| true	274	ldconfig \|\| true
275	endif	275	endif
276	else	276	else

Lines 2-8 Link Here

(-)../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile (-7 / +21 lines)
2	include ../../config.mak	2	include ../../config.mak
3		3
4	ifeq ($(SHARED_PP),yes)	4	ifeq ($(SHARED_PP),yes)
5	SPPLIB = libpostproc.so	5	ifeq ($(CONFIG_DARWIN),yes)
		6	SPPLIB = libpostproc
		7	else
		8	SPPLIB = libpostproc.so
		9	endif
6	SPPVERSION = 0.0.1	10	SPPVERSION = 0.0.1
7	endif	11	endif
8	PPLIB = libpostproc.a	12	PPLIB = libpostproc.a
Lines 23-32 Link Here
23	all: $(SWSLIB) $(PPLIB) $(SPPLIB)	27	all: $(SWSLIB) $(PPLIB) $(SPPLIB)
24		28
25	clean:	29	clean:
26	rm -f .o .a ~ .so	30	rm -f .o .a ~ .so *.dylib
27		31
28	distclean:	32	distclean:
29	rm -f Makefile.bak .o .a ~ .so .depend	33	rm -f Makefile.bak .o .a ~ .so *.dylib .depend
30		34
31	dep: depend	35	dep: depend
32		36
Lines 38-45 Link Here
38	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<	42	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
39		43
40	$(SPPLIB): $(SPPOBJS)	44	$(SPPLIB): $(SPPOBJS)
41	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \	45	ifeq ($(CONFIG_DARWIN),yes)
42	-o $(SPPLIB) $(SPPOBJS)	46	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
		47	-o $(SPPLIB).dylib $(SPPOBJS)
		48	else
		49	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
		50	-o $(SPPLIB) $(SPPOBJS)
		51	endif
43	endif	52	endif
44		53
45	$(PPLIB): $(PPOBJS)	54	$(PPLIB): $(PPOBJS)
Lines 50-57 Link Here
50	install: all	59	install: all
51	ifeq ($(SHARED_PP),yes)	60	ifeq ($(SHARED_PP),yes)
52	install -d $(prefix)/lib	61	install -d $(prefix)/lib
53	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)	62	ifeq ($(CONFIG_DARWIN),yes)
54	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)	63	install -m 755 $(SPPLIB).dylib $(prefix)/lib/$(SPPLIB).$(SPPVERSION).dylib
		64	ln -sf $(SPPLIB).$(SPPVERSION).dylib $(prefix)/lib/$(SPPLIB).dylib
		65	else
		66	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
		67	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
		68	endif
55	ldconfig \|\| true	69	ldconfig \|\| true
56	mkdir -p $(prefix)/include/postproc	70	mkdir -p $(prefix)/include/postproc
57	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h	71	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h

Lines 18-23 Link Here

(-)../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg-0.4.9-pre1/libavformat/Makefile (-3 / +8 lines)
18	nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \	18	nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
19	sierravmd.o matroska.o	19	sierravmd.o matroska.o
20		20
		21	CPU = $(shell uname)
		22	ifeq ($(CPU),Darwin)
		23	OBJS+=../libavcodec/libavcodec.dylib
		24	endif
		25
21	ifeq ($(CONFIG_RISKY),yes)	26	ifeq ($(CONFIG_RISKY),yes)
22	OBJS+= asf.o	27	OBJS+= asf.o
23	OBJS+= asf-enc.o	28	OBJS+= asf-enc.o
Lines 93-99 Link Here
93	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll	98	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
94	-lib /machine:i386 /def:$(@:.dll=.def)	99	-lib /machine:i386 /def:$(@:.dll=.def)
95	else	100	else
96	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)	101	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS)
97	endif	102	endif
98		103
99	depend: $(SRCS)	104	depend: $(SRCS)
Lines 105-112 Link Here
105	install -s -m 755 $(SLIB) "$(prefix)"	110	install -s -m 755 $(SLIB) "$(prefix)"
106	else	111	else
107	install -d $(prefix)/lib	112	install -d $(prefix)/lib
108	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so	113	install -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION)$(SLIBSUF)
109	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so	114	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(prefix)/lib/libavformat$(SLIBSUF)
110	ldconfig \|\| true	115	ldconfig \|\| true
111	endif	116	endif
112	else	117	else




CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS=-bundle -avoid-version -undefined define_a_way 
endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF)

ifeq ($(HAVE_IMLIB2),yes)
    HOOKS += imlib2$(SLIBSUF)
endif    

ifeq ($(HAVE_FREETYPE2),yes)
    HOOKS += drawtext$(SLIBSUF)
    CFLAGS += `freetype-config --cflags`
endif    

all: $(HOOKS) 

SRCS := $(HOOKS:$(SLIBSUF)=.c)

depend: $(SRCS)
	$(CC) -MM $(CFLAGS) $^ 1>.depend

	install -d "$(prefix)/lib/vhook"
	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"

imlib2$(SLIBSUF): imlib2.o
	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2

drawtext$(SLIBSUF): drawtext.o
	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`

%$(SLIBSUF): %.o
	$(CC) -g -o $@ $(SHFLAGS) $<

clean:
	rm -f *.o *.d .depend *$(SLIBSUF) *~

ifneq ($(wildcard .depend),)
include .depend

Return to bug 73542

Lines 5-26 Link Here

(-)../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg-0.4.9-pre1/vhook/Makefile (-9 / +9 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	ifeq ($(CONFIG_DARWIN),yes)	6	ifeq ($(CONFIG_DARWIN),yes)
7	SHFLAGS+=-flat_namespace -undefined suppress	7	SHFLAGS=-bundle -avoid-version -undefined define_a_way
8	endif	8	endif
9	HOOKS=null.so fish.so ppm.so	9	HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF)
10		10
11	ifeq ($(HAVE_IMLIB2),yes)	11	ifeq ($(HAVE_IMLIB2),yes)
12	HOOKS += imlib2.so	12	HOOKS += imlib2$(SLIBSUF)
13	endif	13	endif
14		14
15	ifeq ($(HAVE_FREETYPE2),yes)	15	ifeq ($(HAVE_FREETYPE2),yes)
16	HOOKS += drawtext.so	16	HOOKS += drawtext$(SLIBSUF)
17	CFLAGS += `freetype-config --cflags`	17	CFLAGS += `freetype-config --cflags`
18	endif	18	endif
19		19
20	all: $(HOOKS)	20	all: $(HOOKS)
21		21
22	SRCS := $(HOOKS:.so=.c)	22	SRCS := $(HOOKS:$(SLIBSUF)=.c)
23		23
24	depend: $(SRCS)	24	depend: $(SRCS)
25	$(CC) -MM $(CFLAGS) $^ 1>.depend	25	$(CC) -MM $(CFLAGS) $^ 1>.depend
Lines 29-45 Link Here
29	install -d "$(prefix)/lib/vhook"	29	install -d "$(prefix)/lib/vhook"
30	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"	30	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
31		31
32	imlib2.so: imlib2.o	32	imlib2$(SLIBSUF): imlib2.o
33	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2	33	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
34		34
35	drawtext.so: drawtext.o	35	drawtext$(SLIBSUF): drawtext.o
36	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`	36	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
37		37
38	%.so: %.o	38	%$(SLIBSUF): %.o
39	$(CC) -g -o $@ $(SHFLAGS) $<	39	$(CC) -g -o $@ $(SHFLAGS) $<
40		40
41	clean:	41	clean:
42	rm -f .o .d .depend .so ~	42	rm -f .o .d .depend $(SLIBSUF) ~
43		43
44	ifneq ($(wildcard .depend),)	44	ifneq ($(wildcard .depend),)
45	include .depend	45	include .depend