diff options
author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-02-24 02:23:16 +0000 |
---|---|---|
committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-02-24 02:23:16 +0000 |
commit | 04ca25a7f9957906c5121005391967de930eb58a (patch) | |
tree | 7615d496e9ce83687e96e595170f77be4c5e2bc4 /packages/ffmpeg/ffmpeg/soname.patch | |
parent | 27ed967384469cb10b308e50e147cf981441d4c2 (diff) | |
download | openembedded-04ca25a7f9957906c5121005391967de930eb58a.tar.gz |
ffmpeg: fix 0.4.9-pre1 oebug 1897, fix svn packaging oebug 3850
* gcc4.patch absorbs the original common.patch and adds hacks to satisfy
stricter type checking by gcc4
* soname.patch adds libpostproc fix in oebug 1897 comment#1
* drop the obsolete/dup patches in ffmpeg dir
* 1st attemp to unify 0.4.9 and svn.
* TODO: further unification of packaging and staging is desired once svn recipie settles
Diffstat (limited to 'packages/ffmpeg/ffmpeg/soname.patch')
-rw-r--r-- | packages/ffmpeg/ffmpeg/soname.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/packages/ffmpeg/ffmpeg/soname.patch b/packages/ffmpeg/ffmpeg/soname.patch deleted file mode 100644 index 6d01f922af..0000000000 --- a/packages/ffmpeg/ffmpeg/soname.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- ffmpeg/libavcodec/Makefile.orig 2005-02-10 18:11:57.000000000 +0100 -+++ ffmpeg/libavcodec/Makefile 2005-02-10 18:15:36.000000000 +0100 -@@ -7,7 +7,7 @@ - VPATH=$(SRC_PATH)/libavcodec - - # NOTE: -I.. is needed to include config.h --CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC - - OBJS= bitstream.o utils.o mem.o allcodecs.o \ - mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ -@@ -222,7 +222,7 @@ - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) - -lib /machine:i386 /def:$(@:.dll=.def) - else -- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) -+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavcodec.so.0 - endif - - dsputil.o: dsputil.c dsputil.h -@@ -294,8 +294,9 @@ - install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" - else - install -d $(prefix)/lib -- install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so -- ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so -+ install -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 -+ ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so.0 -+ ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so - ldconfig || true - endif - ifeq ($(CONFIG_PP),yes) - ---- ffmpeg/libavformat/Makefile.orig 2005-02-10 18:15:50.000000000 +0100 -+++ ffmpeg/libavformat/Makefile 2005-02-10 18:18:23.000000000 +0100 -@@ -6,7 +6,7 @@ - - VPATH=$(SRC_PATH)/libavformat - --CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC - - OBJS= utils.o cutils.o os_support.o allformats.o - PPOBJS= -@@ -104,7 +104,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) -Wl,-soname -Wl,libavformat.so.0 - endif - - depend: $(SRCS) -@@ -116,8 +116,9 @@ - install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" - else - install -d $(prefix)/lib -- install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so -- ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so -+ install -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 -+ ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so.0 -+ ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so - ldconfig || true - endif - else |