Attachment #63085 for bug #73542




make="gmake"
;;
Darwin)
cc="gcc"
v4l="no"
audio_oss="no"
dv1394="no"

extralibs=""
darwin="yes"
strip="strip -x"
LDFLAGS="-Wl,-dynamic,-search_paths_first"
SLIBSUF=".dylib"
FFSLDFLAGS=-Wl,-bind_at_load
;;
MINGW32*)

		;;
	    *)
		CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
		if test "$lshared" = no; then
		   needmdynamicnopic="yes"
		fi
		;;
	esac
    fi

Lines 246-252 Link Here

(-)Makefile.orig (-3 / +3 lines)
246	dep: depend	246	dep: depend
247		247
248	clean: $(CLEANAMR)	248	clean: $(CLEANAMR)
249	rm -f .o .d ~ .depend $(LIB) $(SLIB) .so i386/.o i386/~ \	249	rm -f .o .d ~ .depend $(LIB) $(SLIB) $(LIBSUF} .so i386/.o i386/*~ \
250	armv4l/.o armv4l/~ \	250	armv4l/.o armv4l/~ \
251	mlib/.o mlib/~ \	251	mlib/.o mlib/~ \
252	alpha/.o alpha/~ \	252	alpha/.o alpha/~ \
Lines 298-305 Link Here
298	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	298	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
299	else	299	else
300	install -d $(libdir)	300	install -d $(libdir)
301	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so	301	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
302	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so	302	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
303	ldconfig \|\| true	303	ldconfig \|\| true
304	endif	304	endif
305	ifeq ($(CONFIG_PP),yes)	305	ifeq ($(CONFIG_PP),yes)

Lines 25-34 Link Here

(-)Makefile.orig (-2 / +14 lines)
25	all: $(SWSLIB) $(PPLIB) $(SPPLIB)	25	all: $(SWSLIB) $(PPLIB) $(SPPLIB)
26		26
27	clean:	27	clean:
28	rm -f .o .a ~ .so $(PPLIB) $(SPPLIB)	28	rm -f .o .a ~ $(SLIBSUF) $(PPLIB) $(SPPLIB)
29		29
30	distclean:	30	distclean:
31	rm -f Makefile.bak .o .a ~ .so .depend	31	rm -f Makefile.bak .o .a ~ $(SLIBSUF) .depend
32		32
33	dep: depend	33	dep: depend
34		34
Lines 40-48 Link Here
40	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<	40	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
41		41
42	$(SPPLIB): $(SPPOBJS)	42	$(SPPLIB): $(SPPOBJS)
		43	ifeq ($(CONFIG_DARWIN),yes)
		44	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0$(SLIBSUF) \
		45	-o $(SPPLIB)$(SLIBSUF) $(SPPOBJS)
		46	else
43	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \	47	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
44	-o $(SPPLIB) $(SPPOBJS)	48	-o $(SPPLIB) $(SPPOBJS)
45	endif	49	endif
		50	endif
46		51
47	$(PPLIB): $(PPOBJS)	52	$(PPLIB): $(PPOBJS)
48	rm -f $@	53	rm -f $@
Lines 59-64 Link Here
59	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)	64	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
60	ldconfig \|\| true	65	ldconfig \|\| true
61	endif	66	endif
		67	ifeq ($(CONFIG_DARWIN),yes)
		68	install $(INSTALLSTRIP) -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
62	endif	74	endif
63	mkdir -p $(prefix)/include/postproc	75	mkdir -p $(prefix)/include/postproc
64	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h	76	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h

Lines 18-23 Link Here

(-)Makefile.orig (-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 sol.o electronicarts.o nsvdec.o asf.o asf-enc.o	19	sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o
20		20
		21	CPU=$(shell uname)
		22	ifeq ($(CPU),Darwin)
		23	# OBJS+=../libavcodec/libavcodec.a
		24	endif
		25
21	AMROBJS=	26	AMROBJS=
22	ifeq ($(AMR_NB),yes)	27	ifeq ($(AMR_NB),yes)
23	AMROBJS= amr.o	28	AMROBJS= amr.o
Lines 101-107 Link Here
101	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll	106	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
102	-lib /machine:i386 /def:$(@:.dll=.def)	107	-lib /machine:i386 /def:$(@:.dll=.def)
103	else	108	else
104	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)	109	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS)
105	endif	110	endif
106		111
107	depend: $(SRCS)	112	depend: $(SRCS)
Lines 113-120 Link Here
113	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	118	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
114	else	119	else
115	install -d $(libdir)	120	install -d $(libdir)
116	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so	121	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION)$(SLIBSUF)
117	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so	122	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(libdir)/libavformat$(SLIBSUF)
118	ldconfig \|\| true	123	ldconfig \|\| true
119	endif	124	endif
120	else	125	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
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

	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
ifneq ($(wildcard .depend),)
include .depend

Return to bug 73542

Lines 258-264 Link Here

(-)configure.orig (-5 / +3 lines)
258	make="gmake"	258	make="gmake"
259	;;	259	;;
260	Darwin)	260	Darwin)
261	cc="cc"	261	cc="gcc"
262	v4l="no"	262	v4l="no"
263	audio_oss="no"	263	audio_oss="no"
264	dv1394="no"	264	dv1394="no"
Lines 267-273 Link Here
267	extralibs=""	267	extralibs=""
268	darwin="yes"	268	darwin="yes"
269	strip="strip -x"	269	strip="strip -x"
270	LDFLAGS="-Wl,-d,-search_paths_first"	270	LDFLAGS="-Wl,-dynamic,-search_paths_first"
		271	SLIBSUF=".dylib"
271	FFSLDFLAGS=-Wl,-bind_at_load	272	FFSLDFLAGS=-Wl,-bind_at_load
272	;;	273	;;
273	MINGW32*)	274	MINGW32*)
Lines 570-578 Link Here
570	;;	570	;;
571	*)	571	*)
572	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"	572	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
573	if test "$lshared" = no; then
574	needmdynamicnopic="yes"
575	fi
576	;;	573	;;
577	esac	574	esac
578	fi	575	fi

Lines 5-26 Link Here

(-)Makefile.orig (-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		6
7	ifeq ($(CONFIG_DARWIN),yes)	7	ifeq ($(CONFIG_DARWIN),yes)
8	SHFLAGS+=-flat_namespace -undefined suppress	8	SHFLAGS=-bundle avoid-version
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
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
46	ifneq ($(wildcard .depend),)	46	ifneq ($(wildcard .depend),)
47	include .depend	47	include .depend