Attachment #55822 for bug #73542

Lines 283-289 Link Here

(-)configure (-1 / +2 lines)
283	extralibs=""	283	extralibs=""
284	darwin="yes"	284	darwin="yes"
285	strip="strip -x"	285	strip="strip -x"
286	LDFLAGS="-Wl,-d,-search_paths_first"	286	LDFLAGS="-Wl,-dynamic,-search_paths_first"
		287	SLIBSUF=".dylib"
287	FFSLDFLAGS=-Wl,-bind_at_load	288	FFSLDFLAGS=-Wl,-bind_at_load
288	;;	289	;;
289	MINGW32*)	290	MINGW32*)

Lines 251-257 Link Here

(-)libavcodec/Makefile (-3 / +3 lines)
251	dep: depend	251	dep: depend
252		252
253	clean: $(CLEANAMR)	253	clean: $(CLEANAMR)
254	rm -f .o .d ~ .depend $(LIB) $(SLIB) .so i386/.o i386/~ \	254	rm -f .o .d ~ .depend $(LIB) $(SLIB) $(SLIBSUF) i386/.o i386/~ \
255	armv4l/.o armv4l/~ \	255	armv4l/.o armv4l/~ \
256	mlib/.o mlib/~ \	256	mlib/.o mlib/~ \
257	alpha/.o alpha/~ \	257	alpha/.o alpha/~ \
Lines 303-310 Link Here
303	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	303	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
304	else	304	else
305	install -d $(libdir)	305	install -d $(libdir)
306	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so	306	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
307	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so	307	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
308	ldconfig \|\| true	308	ldconfig \|\| true
309	endif	309	endif
310	ifeq ($(CONFIG_PP),yes)	310	ifeq ($(CONFIG_PP),yes)




VPATH=$(SRC_PATH)/libavcodec/libpostproc

ifeq ($(SHARED_PP),yes)
SPPLIB = $(SLIBPREF)postproc
ASPPLIB = $(SLIBPREF)postproc${SLIBSUF}
SPPVERSION = 0.0.1
endif
PPLIB = $(LIBPREF)postproc$(LIBSUF)

.c.o:
	$(CC) -c $(CFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<

all:    $(SWSLIB) $(PPLIB) $(ASPPLIB)

clean:
	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)${SLIBSUF}

distclean:
	rm -f Makefile.bak *.o *.a *~ *.so .depend

postprocess_pic.o: postprocess.c
	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<

$(SPPLIB)${SLIBSUF}: $(SPPOBJS)
ifeq ($(CONFIG_DARWIN),yes)
	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
	-o $(SPPLIB).dylib $(SPPOBJS)
else
	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
	-o $(SPPLIB)$(SLIBSUF) $(SPPOBJS)
endif
endif

$(PPLIB): $(PPOBJS)

install: all
ifeq ($(SHARED_PP),yes)
ifeq ($(CONFIG_WIN32),yes)
	install $(INSTALLSTRIP) -m 755 $(SPPLIB)${SLIBSUF} "$(prefix)"
else
	install -d $(libdir)
	install $(INSTALLSTRIP) -m 755 $(SPPLIB)${SLIBSUF} $(libdir)/$(SPPLIB)-$(SPPVERSION)$(SLIBSUF)
	ln -sf $(SPPLIB)-$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SPPLIB)${SLIBSUF}
	ldconfig || true
endif
endif

Lines 109-116 Link Here

(-)libavformat/Makefile (-2 / +2 lines)
109	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	109	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
110	else	110	else
111	install -d $(libdir)	111	install -d $(libdir)
112	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so	112	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION)$(SLIBSUF)
113	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so	113	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(libdir)/libavformat$(SLIBSUF)
114	ldconfig \|\| true	114	ldconfig \|\| true
115	endif	115	endif
116	else	116	else




ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS+=-flat_namespace -undefined suppress
endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(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

Return to bug 73542

Lines 4-10 Link Here

(-)libavcodec/libpostproc/Makefile (-8 / +14 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	SPPLIB = $(SLIBPREF)postproc
		8	ASPPLIB = $(SLIBPREF)postproc${SLIBSUF}
8	SPPVERSION = 0.0.1	9	SPPVERSION = 0.0.1
9	endif	10	endif
10	PPLIB = $(LIBPREF)postproc$(LIBSUF)	11	PPLIB = $(LIBPREF)postproc$(LIBSUF)
Lines 22-31 Link Here
22	.c.o:	23	.c.o:
23	$(CC) -c $(CFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<	24	$(CC) -c $(CFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
24		25
25	all: $(SWSLIB) $(PPLIB) $(SPPLIB)	26	all: $(SWSLIB) $(PPLIB) $(ASPPLIB)
26		27
27	clean:	28	clean:
28	rm -f .o .a ~ .so $(PPLIB) $(SPPLIB)	29	rm -f .o .a ~ .so $(PPLIB) $(SPPLIB)${SLIBSUF}
29		30
30	distclean:	31	distclean:
31	rm -f Makefile.bak .o .a ~ .so .depend	32	rm -f Makefile.bak .o .a ~ .so .depend
Lines 39-47 Link Here
39	postprocess_pic.o: postprocess.c	40	postprocess_pic.o: postprocess.c
40	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<	41	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
41		42
42	$(SPPLIB): $(SPPOBJS)	43	$(SPPLIB)${SLIBSUF}: $(SPPOBJS)
		44	ifeq ($(CONFIG_DARWIN),yes)
		45	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
		46	-o $(SPPLIB).dylib $(SPPOBJS)
		47	else
43	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \	48	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
44	-o $(SPPLIB) $(SPPOBJS)	49	-o $(SPPLIB)$(SLIBSUF) $(SPPOBJS)
		50	endif
45	endif	51	endif
46		52
47	$(PPLIB): $(PPOBJS)	53	$(PPLIB): $(PPOBJS)
Lines 52-62 Link Here
52	install: all	58	install: all
53	ifeq ($(SHARED_PP),yes)	59	ifeq ($(SHARED_PP),yes)
54	ifeq ($(CONFIG_WIN32),yes)	60	ifeq ($(CONFIG_WIN32),yes)
55	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"	61	install $(INSTALLSTRIP) -m 755 $(SPPLIB)${SLIBSUF} "$(prefix)"
56	else	62	else
57	install -d $(libdir)	63	install -d $(libdir)
58	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)	64	install $(INSTALLSTRIP) -m 755 $(SPPLIB)${SLIBSUF} $(libdir)/$(SPPLIB)-$(SPPVERSION)$(SLIBSUF)
59	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)	65	ln -sf $(SPPLIB)-$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SPPLIB)${SLIBSUF}
60	ldconfig \|\| true	66	ldconfig \|\| true
61	endif	67	endif
62	endif	68	endif

Lines 7-26 Link Here

(-)vhook/Makefile (-4 / +4 lines)
7	ifeq ($(CONFIG_DARWIN),yes)	7	ifeq ($(CONFIG_DARWIN),yes)
8	SHFLAGS+=-flat_namespace -undefined suppress	8	SHFLAGS+=-flat_namespace -undefined suppress
9	endif	9	endif
10	HOOKS=null.so fish.so ppm.so watermark.so	10	HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
11		11
12	ifeq ($(HAVE_IMLIB2),yes)	12	ifeq ($(HAVE_IMLIB2),yes)
13	HOOKS += imlib2.so	13	HOOKS += imlib2$(SLIBSUF)
14	endif	14	endif
15		15
16	ifeq ($(HAVE_FREETYPE2),yes)	16	ifeq ($(HAVE_FREETYPE2),yes)
17	HOOKS += drawtext.so	17	HOOKS += drawtext$(SLIBSUF)
18	CFLAGS += `freetype-config --cflags`	18	CFLAGS += `freetype-config --cflags`
19	endif	19	endif
20		20
21	all: $(HOOKS)	21	all: $(HOOKS)
22		22
23	SRCS := $(HOOKS:.so=.c)	23	SRCS := $(HOOKS:$(SLIBSUF)=.c)
24		24
25	depend: $(SRCS)	25	depend: $(SRCS)
26	$(CC) -MM $(CFLAGS) $^ 1>.depend	26	$(CC) -MM $(CFLAGS) $^ 1>.depend