[patch] Arch-agnostic Patch

ffmpeg-osx.diff (text/plain), 8.93 KB, created by Lina Pezzella (RETIRED) on 2005-08-07 12:51:11 UTC

diff -aur ffmpeg/Makefile ffmpeg-new/Makefile
--- ffmpeg/Makefile	2005-08-01 16:07:02.000000000 -0400
+++ ffmpeg-new/Makefile	2005-08-07 15:29:02.000000000 -0400
@@ -101,7 +101,11 @@
 	$(MAKE) -C libavformat all
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+ifeq ($(CONFIG_DARWIN),yes)
+	$(CC) $(LDFLAGS) -bind_at_load -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
+else
 	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
+endif
 
 ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
 	cp -p $< $@
diff -aur ffmpeg/configure ffmpeg-new/configure
--- ffmpeg/configure	2005-08-04 15:50:09.000000000 -0400
+++ ffmpeg-new/configure	2005-08-07 15:19:56.000000000 -0400
@@ -308,11 +308,12 @@
 audio_oss="no"
 dv1394="no"
 ffserver="no"
-SHFLAGS="-dynamiclib"
+SHFLAGS="-dynamiclib -Wl -single_module -undefined dynamic_lookup"
 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*)
@@ -644,7 +645,7 @@
 		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"
+		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
diff -aur ffmpeg/libavcodec/Makefile ffmpeg-new/libavcodec/Makefile
--- ffmpeg/libavcodec/Makefile	2005-08-01 16:07:03.000000000 -0400
+++ ffmpeg-new/libavcodec/Makefile	2005-08-07 15:32:20.000000000 -0400
@@ -19,6 +19,11 @@
       dpcm.o adx.o faandct.o parser.o g726.o \
       vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o
 
+ifeq ($(SHARED_PP),yes)
+SPPMAJOR = 0
+SPPVERSION = $(SPPMAJOR).0.1
+endif        
+
 ifeq ($(CONFIG_AASC_DECODER),yes)
     OBJS+= aasc.o
 endif
@@ -403,8 +408,12 @@
 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
 	-lib /machine:i386 /def:$(@:.dll=.def)
 else
+ifeq ($(CONFIG_DARWIN),yes)  
+	$(CC) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
+else
 	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
 endif
+endif
 
 dsputil.o: dsputil.c dsputil.h
 
@@ -423,7 +432,7 @@
 dep:	depend
 
 clean: $(CLEANAMR)
-	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
+	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *$(SLIBSUF) i386/*.o i386/*~ \
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
 	   alpha/*.o alpha/*~ \
@@ -475,10 +484,15 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(libdir)
+ifeq ($(CONFIG_DARWIN),yes)
+	install -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
+	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
+else
 	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
-	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
+	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so 
 	$(LDCONFIG) || true
 endif
+endif
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc $@
 endif
diff -aur ffmpeg/libavcodec/libpostproc/Makefile ffmpeg-new/libavcodec/libpostproc/Makefile
--- ffmpeg/libavcodec/libpostproc/Makefile	2005-06-26 20:55:29.000000000 -0400
+++ ffmpeg-new/libavcodec/libpostproc/Makefile	2005-08-07 15:19:56.000000000 -0400
@@ -41,9 +41,13 @@
 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
 $(SPPLIB): $(SPPOBJS)
+ifeq ($(CONFIG_DARWIN),yes)
+	$(CC) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,$(SLIBPREF)postproc$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -o $(SPPLIB) $(SPPOBJS)
+else
 	$(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
 	-o $(SPPLIB) $(SPPOBJS)
 endif
+endif
 
 $(PPLIB): $(PPOBJS)
 	rm -f $@
@@ -56,9 +60,15 @@
 	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
 else
 	install -d $(libdir)
+ifeq ($(CONFIG_DARWIN),yes)
+	install -m 755 $(SPPLIB) $(libdir)/$(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF)
+	ln -sf $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SPPLIB)
+	ln -sf $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF)
+else
 	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
 	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
 	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
+endif
 	install -d $(libdir)/pkgconfig
 	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
 	$(LDCONFIG) || true
diff -aur ffmpeg/libavcodec/ppc/fdct_altivec.c ffmpeg-new/libavcodec/ppc/fdct_altivec.c
--- ffmpeg/libavcodec/ppc/fdct_altivec.c	2005-08-05 15:15:34.000000000 -0400
+++ ffmpeg-new/libavcodec/ppc/fdct_altivec.c	2005-08-07 15:19:56.000000000 -0400
@@ -18,7 +18,7 @@
  */
 
 
-#include "common.h"
+#include "../../libavutil/common.h"
 #include "../dsputil.h"
 #include "dsputil_altivec.h"
 #include "gcc_fixes.h"
diff -aur ffmpeg/libavformat/Makefile ffmpeg-new/libavformat/Makefile
--- ffmpeg/libavformat/Makefile	2005-08-01 16:07:04.000000000 -0400
+++ ffmpeg-new/libavformat/Makefile	2005-08-07 15:34:29.000000000 -0400
@@ -113,10 +113,15 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(libdir)
+ifeq ($(CONFIG_DARWIN),yes)
+	install -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION)$(SLIBSUF)
+	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(libdir)/libavformat$(SLIBSUF)
+else
 	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
 	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
 	$(LDCONFIG) || true
 endif
+endif
 else
 install:
 endif
@@ -141,7 +146,7 @@
 	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< 
 
 distclean clean: 
-	rm -f *.o *.d .depend *~ *.a *.so $(LIB)
+	rm -f *.o *.d .depend *~ *.a *$(SLIBSUF) $(LIB)
 
 #
 # include dependency files if they exist
diff -aur ffmpeg/libavutil/Makefile ffmpeg-new/libavutil/Makefile
--- ffmpeg/libavutil/Makefile	2005-08-01 16:07:04.000000000 -0400
+++ ffmpeg-new/libavutil/Makefile	2005-08-07 15:42:04.000000000 -0400
@@ -22,6 +22,8 @@
 
 LIB= $(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
+SPPMAJOR=0
+SPPVERSION=$(SPPMAJOR).0.1
 SLIB= $(SLIBPREF)avutil$(SLIBSUF)
 endif
 
@@ -37,8 +39,12 @@
 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
 	-lib /machine:i386 /def:$(@:.dll=.def)
 else
+ifeq ($(CONFIG_DARWIN),yes)
+	$(CC) $(SHFLAGS) -dynamiclib -Wl,-undefined,dynamic_lookup,-install_name,$(SLIBPREF)avutil$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
+else
 	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
 endif
+endif
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< 
@@ -49,7 +55,7 @@
 dep:	depend
 
 clean:
-	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so
+	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *$(SLIBSUF)
 
 distclean: clean
 	rm -f Makefile.bak .depend
@@ -60,11 +66,16 @@
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
+ifeq ($(CONFIG_DARWIN),yes)
 	install -d $(libdir)
+	install -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
+	ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/libavutil$(SLIBSUF)
+else
 	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION).so
 	ln -sf libavutil-$(VERSION).so $(libdir)/libavutil.so
 	$(LDCONFIG) || true
 endif
+endif
 else
 install:
 endif
diff -aur ffmpeg/vhook/Makefile ffmpeg-new/vhook/Makefile
--- ffmpeg/vhook/Makefile	2005-08-01 16:07:05.000000000 -0400
+++ ffmpeg-new/vhook/Makefile	2005-08-07 15:19:56.000000000 -0400
@@ -5,22 +5,22 @@
 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 -undefined suppress
+SHFLAGS+=-flat_namespace
 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 "$(libdir)/vhook"
 	install -m 755 $(HOOKS) "$(libdir)/vhook"
 
-imlib2.so: imlib2.o
+imlib2$(SLIBSUF): imlib2.o
 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
 
-drawtext.so: drawtext.o
+drawtext$(SLIBSUF): drawtext.o
 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
 
-%.so: %.o
+%$(SLIBSUF): %.o
 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
 
 clean:
-	rm -f *.o *.d .depend *.so *~
+	rm -f *.o *.d .depend *$(SLIBSUF) *~
 
 ifneq ($(wildcard .depend),)
 include .depend