[patch] patch to apply on ffmpeg-0.4.9_p20050226 to make it more OSX compliant (not complete)

ffmpeg-0.4.9_p20050226-osx.patch (text/plain), 5.72 KB, created by Fabian Groffen on 2005-07-10 11:31:59 UTC

diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/configure ./configure
--- configure.orig	2005-07-10 12:15:25.000000000 +0200
+++ ./configure	2005-07-10 12:32:10.000000000 +0200
@@ -258,7 +258,7 @@
 make="gmake"
 ;;
 Darwin)
-cc="cc"
+cc="gcc"
 v4l="no"
 audio_oss="no"
 dv1394="no"
@@ -267,7 +267,8 @@
 extralibs=""
 darwin="yes"
 strip="strip -x"
-LDFLAGS="-Wl,-d,-search_paths_first"
+LDFLAGS="-Wl,-dynamic,-search_paths_first"
+SLIBSUF=".dylib"
 FFSLDFLAGS=-Wl,-bind_at_load
 ;;
 MINGW32*)
@@ -570,9 +570,6 @@
 		;;
 	    *)
 		CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
-		if test "$lshared" = no; then
-		   needmdynamicnopic="yes"
-		fi
 		;;
 	esac
     fi
diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/Makefile ./libavcodec/Makefile
--- Makefile.orig	2005-07-10 14:41:38.000000000 +0200
+++ ./libavcodec/Makefile	2005-07-10 14:45:26.000000000 +0200
@@ -246,7 +246,7 @@
 dep:	depend
 
 clean: $(CLEANAMR)
-	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
+	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *$(LIBSUF} *.so i386/*.o i386/*~ \
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
 	   alpha/*.o alpha/*~ \
@@ -298,8 +298,8 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
-	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
+	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
+	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
 	ldconfig || true
 endif
 ifeq ($(CONFIG_PP),yes)
diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile ./libavcodec/libpostproc/Makefile
--- Makefile.orig	2005-02-04 04:29:50.000000000 +0100
+++ ./libavcodec/libpostproc/Makefile	2005-07-10 13:03:44.000000000 +0200
@@ -25,10 +25,10 @@
 all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
 
 clean:
-	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
+	rm -f *.o *.a *~ *$(SLIBSUF) $(PPLIB) $(SPPLIB)
 
 distclean:
-	rm -f Makefile.bak *.o *.a *~ *.so .depend
+	rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend
 
 dep:    depend
 
@@ -40,9 +40,14 @@
 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
 $(SPPLIB): $(SPPOBJS)
+ifeq ($(CONFIG_DARWIN),yes)
+	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0$(SLIBSUF) \
+	-o $(SPPLIB)$(SLIBSUF) $(SPPOBJS)
+else
 	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
 	-o $(SPPLIB) $(SPPOBJS)
 endif
+endif
 
 $(PPLIB): $(PPOBJS)
 	rm -f $@
@@ -59,6 +64,13 @@
 	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
 	ldconfig || true
 endif
+ifeq ($(CONFIG_DARWIN),yes)
+	install $(INSTALLSTRIP) -m 755 $(SPPLIB)$(SLIBSUF) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)$(SLIBSUF)
+	ln -sf $(SPPLIB).$(SPPVERSION)$(SLIBSUF) $(prefix)/lib/$(SPPLIB)$(SLIBSUF)
+else
+	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
+	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
+endif
 endif
 	mkdir -p $(prefix)/include/postproc
 	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavformat/Makefile ./libavformat/Makefile
--- Makefile.orig	2005-07-10 14:41:39.000000000 +0200
+++ ./libavformat/Makefile	2005-07-10 14:49:15.000000000 +0200
@@ -18,6 +18,11 @@
       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
       sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o
 
+CPU=$(shell uname)
+ifeq ($(CPU),Darwin)
+#	OBJS+=../libavcodec/libavcodec.a
+endif
+
 AMROBJS=
 ifeq ($(AMR_NB),yes)
 AMROBJS= amr.o
@@ -101,7 +106,7 @@
 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
 	-lib /machine:i386 /def:$(@:.dll=.def)
 else
-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
+	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS)
 endif
 
 depend: $(SRCS)
@@ -113,8 +118,8 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
-	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
+	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION)$(SLIBSUF)
+	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(libdir)/libavformat$(SLIBSUF)
 	ldconfig || true
 endif
 else
diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/vhook/Makefile ./vhook/Makefile
--- Makefile.orig	2005-02-25 23:22:20.000000000 +0100
+++ ./vhook/Makefile	2005-07-10 13:21:55.000000000 +0200
@@ -5,22 +5,22 @@
 CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
 
 ifeq ($(CONFIG_DARWIN),yes)
-SHFLAGS+=-flat_namespace -undefined suppress
+SHFLAGS=-bundle avoid-version
 endif
-HOOKS=null.so fish.so ppm.so watermark.so
+HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
 
 ifeq ($(HAVE_IMLIB2),yes)
-    HOOKS += imlib2.so
+    HOOKS += imlib2$(SLIBSUF)
 endif    
 
 ifeq ($(HAVE_FREETYPE2),yes)
-    HOOKS += drawtext.so
+    HOOKS += drawtext$(SLIBSUF)
     CFLAGS += `freetype-config --cflags`
 endif    
 
 all: $(HOOKS) 
 
-SRCS := $(HOOKS:.so=.c)
+SRCS := $(HOOKS:$(SLIBSUF)=.c)
 
 depend: $(SRCS)
 	$(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -29,17 +29,17 @@
 	install -d "$(prefix)/lib/vhook"
 	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
 
-imlib2.so: imlib2.o
+imlib2$(SLIBSUF): imlib2.o
 	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
 
-drawtext.so: drawtext.o
+drawtext$(SLIBSUF): drawtext.o
 	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
 
-%.so: %.o
+%$(SLIBSUF): %.o
 	$(CC) -g -o $@ $(SHFLAGS) $<
 
 clean:
-	rm -f *.o *.d .depend *.so *~
+	rm -f *.o *.d .depend *$(SLIBSUF) *~
 
 ifneq ($(wildcard .depend),)
 include .depend
 ifneq ($(wildcard .depend),)
 include .depend