[patch] patch against the current cvs

cvs.patch (text/plain), 4.96 KB, created by Luca Barbato on 2005-04-09 16:20:06 UTC

Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.167
diff -u -b -B -u -r1.167 configure
--- configure	9 Apr 2005 15:32:58 -0000	1.167
+++ configure	9 Apr 2005 23:04:54 -0000
@@ -283,7 +283,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*)
Index: libavcodec/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.182
diff -u -b -B -u -r1.182 Makefile
--- libavcodec/Makefile	3 Apr 2005 05:02:08 -0000	1.182
+++ libavcodec/Makefile	9 Apr 2005 23:04:55 -0000
@@ -251,7 +251,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/*~ \
@@ -303,8 +303,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).so $(libdir)/libavcodec$(SLIBSUF)
 	ldconfig || true
 endif
 ifeq ($(CONFIG_PP),yes)
Index: libavcodec/libpostproc/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v
retrieving revision 1.21
diff -u -b -B -u -r1.21 Makefile
--- libavcodec/libpostproc/Makefile	23 Mar 2005 14:10:22 -0000	1.21
+++ libavcodec/libpostproc/Makefile	9 Apr 2005 23:10:14 -0000
@@ -4,7 +4,7 @@
 VPATH=$(SRC_PATH)/libavcodec/libpostproc
 
 ifeq ($(SHARED_PP),yes)
-SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
+SPPLIB = $(SLIBPREF)postproc
 SPPVERSION = 0.0.1
 endif
 PPLIB = $(LIBPREF)postproc$(LIBSUF)
@@ -22,10 +22,10 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
 
-all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
+all:    $(SWSLIB) $(PPLIB) $(SPPLIB)${SLIBSUF}
 
 clean:
-	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
+	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)${SLIBSUF}
 
 distclean:
 	rm -f Makefile.bak *.o *.a *~ *.so .depend
@@ -39,9 +39,14 @@
 postprocess_pic.o: postprocess.c
 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
-$(SPPLIB): $(SPPOBJS)
+$(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) $(SPPOBJS)
+	-o $(SPPLIB)$(SLIBSUF) $(SPPOBJS)
+endif
 endif
 
 $(PPLIB): $(PPOBJS)
@@ -52,11 +57,11 @@
 install: all
 ifeq ($(SHARED_PP),yes)
 ifeq ($(CONFIG_WIN32),yes)
-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+	install $(INSTALLSTRIP) -m 755 $(SPPLIB)${SLIBSUF} "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+	install $(INSTALLSTRIP) -m 755 $(SPPLIB)${SLIBSUF} $(libdir)/$(SPPLIB)-$(SPPVERSION)$(SLIBSUF)
+	ln -sf $(SPPLIB)-$(SPPVERSION)$(SLIBSUF) $(libdir)/$(SPPLIB)${SLIBSUF}
 	ldconfig || true
 endif
 endif
Index: libavformat/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.86
diff -u -b -B -u -r1.86 Makefile
--- libavformat/Makefile	9 Apr 2005 15:32:58 -0000	1.86
+++ libavformat/Makefile	9 Apr 2005 23:10:32 -0000
@@ -109,8 +109,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).so $(libdir)/libavformat$(SLIBSUF)
 	ldconfig || true
 endif
 else
Index: vhook/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v
retrieving revision 1.20
diff -u -b -B -u -r1.20 Makefile
--- vhook/Makefile	16 Mar 2005 19:11:58 -0000	1.20
+++ vhook/Makefile	9 Apr 2005 23:10:33 -0000
@@ -7,20 +7,20 @@
 ifeq ($(CONFIG_DARWIN),yes)
 SHFLAGS+=-flat_namespace -undefined suppress
 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