Attachment #65340 for bug #73542

Lines 101-107 Link Here

(-)ffmpeg/Makefile (+4 lines)
101	$(MAKE) -C libavformat all	101	$(MAKE) -C libavformat all
102		102
103	ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs	103	ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
		104	ifeq ($(CONFIG_DARWIN),yes)
		105	$(CC) $(LDFLAGS) -bind_at_load -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
		106	else
104	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)	107	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
		108	endif
105		109
106	ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)	110	ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
107	cp -p $< $@	111	cp -p $< $@




audio_oss="no"
dv1394="no"
ffserver="no"
SHFLAGS="-dynamiclib -Wl -single_module -undefined dynamic_lookup"
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"
		;;
	    *[34].*)
		CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare -fno-common"
		if test "$lshared" = no; then
		   needmdynamicnopic="yes"
		fi

Lines 19-24 Link Here

(-)ffmpeg/libavcodec/Makefile (-2 / +16 lines)
19	dpcm.o adx.o faandct.o parser.o g726.o \	19	dpcm.o adx.o faandct.o parser.o g726.o \
20	vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o	20	vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o
21		21
		22	ifeq ($(SHARED_PP),yes)
		23	SPPMAJOR = 0
		24	SPPVERSION = $(SPPMAJOR).0.1
		25	endif
		26
22	ifeq ($(CONFIG_AASC_DECODER),yes)	27	ifeq ($(CONFIG_AASC_DECODER),yes)
23	OBJS+= aasc.o	28	OBJS+= aasc.o
24	endif	29	endif
Lines 403-410 Link Here
403	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)	408	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
404	-lib /machine:i386 /def:$(@:.dll=.def)	409	-lib /machine:i386 /def:$(@:.dll=.def)
405	else	410	else
		411	ifeq ($(CONFIG_DARWIN),yes)
		412	$(CC) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
		413	else
406	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)	414	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
407	endif	415	endif
		416	endif
408		417
409	dsputil.o: dsputil.c dsputil.h	418	dsputil.o: dsputil.c dsputil.h
410		419
Lines 423-429 Link Here
423	dep: depend	432	dep: depend
424		433
425	clean: $(CLEANAMR)	434	clean: $(CLEANAMR)
426	rm -f .o .d ~ .depend $(LIB) $(SLIB) .so i386/.o i386/~ \	435	rm -f .o .d ~ .depend $(LIB) $(SLIB) $(SLIBSUF) i386/.o i386/~ \
427	armv4l/.o armv4l/~ \	436	armv4l/.o armv4l/~ \
428	mlib/.o mlib/~ \	437	mlib/.o mlib/~ \
429	alpha/.o alpha/~ \	438	alpha/.o alpha/~ \
Lines 475-484 Link Here
475	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	484	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
476	else	485	else
477	install -d $(libdir)	486	install -d $(libdir)
		487	ifeq ($(CONFIG_DARWIN),yes)
		488	install -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
		489	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
		490	else
478	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so	491	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
479	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so	492	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
480	$(LDCONFIG) \|\| true	493	$(LDCONFIG) \|\| true
481	endif	494	endif
		495	endif
482	ifeq ($(CONFIG_PP),yes)	496	ifeq ($(CONFIG_PP),yes)
483	$(MAKE) -C libpostproc $@	497	$(MAKE) -C libpostproc $@
484	endif	498	endif

Lines 41-49 Link Here

(-)ffmpeg/libavcodec/libpostproc/Makefile (+10 lines)
41	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<	41	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
42		42
43	$(SPPLIB): $(SPPOBJS)	43	$(SPPLIB): $(SPPOBJS)
		44	ifeq ($(CONFIG_DARWIN),yes)
		45	$(CC) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,$(SLIBPREF)postproc$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -o $(SPPLIB) $(SPPOBJS)
		46	else
44	$(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \	47	$(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
45	-o $(SPPLIB) $(SPPOBJS)	48	-o $(SPPLIB) $(SPPOBJS)
46	endif	49	endif
		50	endif
47		51
48	$(PPLIB): $(PPOBJS)	52	$(PPLIB): $(PPOBJS)
49	rm -f $@	53	rm -f $@
Lines 56-64 Link Here
56	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"	60	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
57	else	61	else
58	install -d $(libdir)	62	install -d $(libdir)
		63	ifeq ($(CONFIG_DARWIN),yes)
		64	install -m 755 $(SPPLIB) $(libdir)/$(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF)
		65	ln -sf $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SPPLIB)
		66	ln -sf $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF)
		67	else
59	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)	68	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
60	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)	69	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
61	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)	70	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
		71	endif
62	install -d $(libdir)/pkgconfig	72	install -d $(libdir)/pkgconfig
63	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig	73	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
64	$(LDCONFIG) \|\| true	74	$(LDCONFIG) \|\| true

Lines 18-24 Link Here

(-)ffmpeg/libavcodec/ppc/fdct_altivec.c (-1 / +1 lines)
18	*/	18	*/
19		19
20		20
21	#include "common.h"	21	#include "../../libavutil/common.h"
22	#include "../dsputil.h"	22	#include "../dsputil.h"
23	#include "dsputil_altivec.h"	23	#include "dsputil_altivec.h"
24	#include "gcc_fixes.h"	24	#include "gcc_fixes.h"

Lines 81-87 Link Here

(-)ffmpeg/libavformat/Makefile (-2 / +7 lines)
81	ifeq ($(BUILD_SHARED),yes)	81	ifeq ($(BUILD_SHARED),yes)
82	SLIB= $(SLIBPREF)avformat$(SLIBSUF)	82	SLIB= $(SLIBPREF)avformat$(SLIBSUF)
83		83
84	AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec	84	AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
85	ifeq ($(CONFIG_MP3LAME),yes)	85	ifeq ($(CONFIG_MP3LAME),yes)
86	AVCLIBS+=-lmp3lame	86	AVCLIBS+=-lmp3lame
87	endif	87	endif
Lines 113-122 Link Here
113	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	113	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
114	else	114	else
115	install -d $(libdir)	115	install -d $(libdir)
		116	ifeq ($(CONFIG_DARWIN),yes)
		117	install -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION)$(SLIBSUF)
		118	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(libdir)/libavformat$(SLIBSUF)
		119	else
116	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so	120	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
117	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so	121	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
118	$(LDCONFIG) \|\| true	122	$(LDCONFIG) \|\| true
119	endif	123	endif
		124	endif
120	else	125	else
121	install:	126	install:
122	endif	127	endif
Lines 141-147 Link Here
141	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<	146	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
142		147
143	distclean clean:	148	distclean clean:
144	rm -f .o .d .depend ~ .a *.so $(LIB)	149	rm -f .o .d .depend ~ .a *$(SLIBSUF) $(LIB)
145		150
146	#	151	#
147	# include dependency files if they exist	152	# include dependency files if they exist

Lines 22-27 Link Here

(-)ffmpeg/libavutil/Makefile (-1 / +12 lines)
22		22
23	LIB= $(LIBPREF)avutil$(LIBSUF)	23	LIB= $(LIBPREF)avutil$(LIBSUF)
24	ifeq ($(BUILD_SHARED),yes)	24	ifeq ($(BUILD_SHARED),yes)
		25	SPPMAJOR=0
		26	SPPVERSION=$(SPPMAJOR).0.1
25	SLIB= $(SLIBPREF)avutil$(SLIBSUF)	27	SLIB= $(SLIBPREF)avutil$(SLIBSUF)
26	endif	28	endif
27		29
Lines 37-44 Link Here
37	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)	39	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
38	-lib /machine:i386 /def:$(@:.dll=.def)	40	-lib /machine:i386 /def:$(@:.dll=.def)
39	else	41	else
		42	ifeq ($(CONFIG_DARWIN),yes)
		43	$(CC) $(SHFLAGS) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,$(SLIBPREF)avutil$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
		44	else
40	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)	45	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
41	endif	46	endif
		47	endif
42		48
43	%.o: %.c	49	%.o: %.c
44	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<	50	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
Lines 49-55 Link Here
49	dep: depend	55	dep: depend
50		56
51	clean:	57	clean:
52	rm -f .o .d ~ .depend $(LIB) $(SLIB) .so	58	rm -f .o .d ~ .depend $(LIB) $(SLIB) $(SLIBSUF)
53		59
54	distclean: clean	60	distclean: clean
55	rm -f Makefile.bak .depend	61	rm -f Makefile.bak .depend
Lines 60-70 Link Here
60	ifeq ($(CONFIG_WIN32),yes)	66	ifeq ($(CONFIG_WIN32),yes)
61	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"	67	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
62	else	68	else
		69	ifeq ($(CONFIG_DARWIN),yes)
63	install -d $(libdir)	70	install -d $(libdir)
		71	install -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
		72	ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/libavutil$(SLIBSUF)
		73	else
64	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION).so	74	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION).so
65	ln -sf libavutil-$(VERSION).so $(libdir)/libavutil.so	75	ln -sf libavutil-$(VERSION).so $(libdir)/libavutil.so
66	$(LDCONFIG) \|\| true	76	$(LDCONFIG) \|\| true
67	endif	77	endif
		78	endif
68	else	79	else
69	install:	80	install:
70	endif	81	endif




CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H

ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS+=-flat_namespace
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 "$(libdir)/vhook"
	install -m 755 $(HOOKS) "$(libdir)/vhook"

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

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

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

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

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

Return to bug 73542

Lines 308-318 Link Here

(-)ffmpeg/configure (-3 / +4 lines)
308	audio_oss="no"	308	audio_oss="no"
309	dv1394="no"	309	dv1394="no"
310	ffserver="no"	310	ffserver="no"
311	SHFLAGS="-dynamiclib"	311	SHFLAGS="-dynamiclib -Wl -single_module -undefined dynamic_lookup"
312	extralibs=""	312	extralibs=""
313	darwin="yes"	313	darwin="yes"
314	strip="strip -x"	314	strip="strip -x"
315	LDFLAGS="-Wl,-d,-search_paths_first"	315	LDFLAGS="-Wl,-dynamic,-search_paths_first"
		316	SLIBSUF=".dylib"
316	FFSLDFLAGS=-Wl,-bind_at_load	317	FFSLDFLAGS=-Wl,-bind_at_load
317	;;	318	;;
318	MINGW32*)	319	MINGW32*)
Lines 644-650 Link Here
644	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"	645	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
645	;;	646	;;
646	[34].)	647	[34].)
647	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"	648	CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare -fno-common"
648	if test "$lshared" = no; then	649	if test "$lshared" = no; then
649	needmdynamicnopic="yes"	650	needmdynamicnopic="yes"
650	fi	651	fi

Lines 5-26 Link Here

(-)ffmpeg/vhook/Makefile (-9 / +9 lines)
5	CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H	5	CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
6		6
7	ifeq ($(CONFIG_DARWIN),yes)	7	ifeq ($(CONFIG_DARWIN),yes)
8	SHFLAGS+=-flat_namespace -undefined suppress	8	SHFLAGS+=-flat_namespace
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 "$(libdir)/vhook"	29	install -d "$(libdir)/vhook"
30	install -m 755 $(HOOKS) "$(libdir)/vhook"	30	install -m 755 $(HOOKS) "$(libdir)/vhook"
31		31
32	imlib2.so: imlib2.o	32	imlib2$(SLIBSUF): imlib2.o
33	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2	33	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
34		34
35	drawtext.so: drawtext.o	35	drawtext$(SLIBSUF): drawtext.o
36	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`	36	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
37		37
38	%.so: %.o	38	%$(SLIBSUF): %.o
39	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<	39	$(CC) $(LDFLAGS) -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