SOURCES (DEVEL): ffmpeg-libtool.patch - updated for 20050806 snapshot

qboosh qboosh at pld-linux.org
Thu Oct 13 17:30:54 CEST 2005 

Author: qboosh                       Date: Thu Oct 13 15:30:54 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated for 20050806 snapshot

---- Files affected:
SOURCES:
   ffmpeg-libtool.patch (1.9 -> 1.9.2.1) 

---- Diffs:

================================================================
Index: SOURCES/ffmpeg-libtool.patch
diff -u SOURCES/ffmpeg-libtool.patch:1.9 SOURCES/ffmpeg-libtool.patch:1.9.2.1
--- SOURCES/ffmpeg-libtool.patch:1.9	Wed Oct 20 20:55:32 2004
+++ SOURCES/ffmpeg-libtool.patch	Thu Oct 13 17:30:49 2005
@@ -1,14 +1,15 @@
---- ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile.orig	2003-05-11 13:26:35.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile	2004-10-20 00:06:07.937943400 +0200
-@@ -1,14 +1,9 @@
+--- FFMpeg-20050806/libavcodec/libpostproc/Makefile.orig	2005-06-27 02:55:29.000000000 +0200
++++ FFMpeg-20050806/libavcodec/libpostproc/Makefile	2005-10-12 21:02:22.008159688 +0200
+@@ -3,15 +3,11 @@
  
- include ../../config.mak
+ VPATH=$(SRC_PATH)/libavcodec/libpostproc
  
 -ifeq ($(SHARED_PP),yes)
--SPPLIB = libpostproc.so
--SPPVERSION = 0.0.1
+-SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
+ SPPMAJOR = 0
+ SPPVERSION = $(SPPMAJOR).0.1
 -endif
--PPLIB = libpostproc.a
+-PPLIB = $(LIBPREF)postproc$(LIBSUF)
 +PPLIB = libpostproc.la
  
 -PPOBJS=postprocess.o
@@ -17,21 +18,21 @@
  
  CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
  # -I/usr/X11R6/include/
-@@ -17,10 +12,10 @@
+@@ -20,10 +16,10 @@
  
  # .PHONY: all clean
  
 -.c.o:
--	$(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
+-	$(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
 +%.lo: %.c
-+	libtool --mode=compile $(CC) -c $(CFLAGS) -I.. -I../.. -o $@ $<
++	libtool --mode=compile $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
  
 -all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
 +all:    $(SWSLIB) $(PPLIB)
  
  clean:
- 	rm -f *.o *.a *~ *.so
-@@ -34,27 +29,20 @@
+ 	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
+@@ -37,35 +33,23 @@
  	$(CC) -MM $(CFLAGS) postprocess.c 1>.depend
  
  ifeq ($(SHARED_PP),yes)
@@ -39,7 +40,7 @@
 -	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 -
 -$(SPPLIB): $(SPPOBJS)
--	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
+-	$(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
 -	-o $(SPPLIB) $(SPPOBJS)
 +RPATH= -rpath $(libdir)
 +else
@@ -54,61 +55,282 @@
  
  install: all
  ifeq ($(SHARED_PP),yes)
--	install -d $(prefix)/lib
--	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
--	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
--	ldconfig || true
--	mkdir -p $(prefix)/include/postproc
--	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
+-ifeq ($(CONFIG_WIN32),yes)
+-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+-else
+-	install -d $(libdir)
+-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
+-	install -d $(libdir)/pkgconfig
+-	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
+-	$(LDCONFIG) || true
 +	install -d $(DESTDIR)$(libdir)
-+	libtool --mode=install install -m 755 $(PPLIB) $(DESTDIR)$(libdir)
-+	install -d  $(DESTDIR)$(prefix)/include/postproc
-+	install -m 644 postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
++	libtool --mode=install install $(INSTALLSTRIP) $(PPLIB) $(DESTDIR)$(libdir)
++	install -d $(DESTDIR)$(libdir)/pkgconfig
++	install -m 644 ../../libpostproc.pc $(DESTDIR)$(libdir)/pkgconfig
  endif
+-endif
+-	mkdir -p $(prefix)/include/postproc
+-	install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
++	install -d $(DESTDIR)$(prefix)/include/postproc
++	install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
  
  
---- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig	2004-06-18 15:11:15.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/Makefile	2004-10-20 00:22:26.825129928 +0200
-@@ -9,72 +9,72 @@
+ #
+--- FFMpeg-20050806/libavcodec/Makefile.orig	2005-08-01 22:07:03.000000000 +0200
++++ FFMpeg-20050806/libavcodec/Makefile	2005-10-12 20:58:13.433948712 +0200
+@@ -9,228 +9,228 @@
  # 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.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
  
--OBJS= common.o utils.o mem.o allcodecs.o \
+-OBJS= bitstream.o utils.o mem.o allcodecs.o \
 -      mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
 -      mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \
 -      motion_est.o imgconvert.o imgresample.o \
 -      mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
--      ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
--      fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
--      vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
--      roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
--      msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
--      smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
--      flac.o vp3dsp.o integer.o
-+OBJS= common.lo utils.lo mem.lo allcodecs.lo \
-+      mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo \
+-      ratecontrol.o adpcm.o eval.o error_resilience.o \
+-      fft.o mdct.o raw.o golomb.o cabac.o\
+-      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
++OBJS= bitstream.lo utils.lo mem.lo allcodecs.lo \
++      mpegvideo.lo jrevdct.lo jfdctfst.lo jfdctint.lo\
 +      mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo resample2.lo dsputil.lo \
 +      motion_est.lo imgconvert.lo imgresample.lo \
 +      mpeg12.lo mpegaudiodec.lo pcm.lo simple_idct.lo \
-+      ratecontrol.lo adpcm.lo eval.lo dv.lo error_resilience.lo \
-+      fft.lo mdct.lo mace.lo huffyuv.lo cyuv.lo opts.lo raw.lo h264.lo golomb.lo \
-+      vp3.lo asv1.lo 4xm.lo cabac.lo ffv1.lo ra144.lo ra288.lo vcr1.lo cljr.lo \
-+      roqvideo.lo dpcm.lo interplayvideo.lo xan.lo rpza.lo cinepak.lo msrle.lo \
-+      msvideo1.lo vqavideo.lo idcinvideo.lo adx.lo rational.lo faandct.lo 8bps.lo \
-+      smc.lo parser.lo flicvideo.lo truemotion1.lo vmdav.lo lcl.lo qtrle.lo g726.lo \
-+      flac.lo vp3dsp.lo integer.lo
- 
++      ratecontrol.lo adpcm.lo eval.lo error_resilience.lo \
++      fft.lo mdct.lo raw.lo golomb.lo cabac.lo\
++      dpcm.lo adx.lo faandct.lo parser.lo g726.lo \
++      vp3dsp.lo h264idct.lo rangecoder.lo pnm.lo h263.lo msmpeg4.lo h263dec.lo dvdsub.lo dvbsub.lo dvbsubdec.lo
+ 
+ ifeq ($(CONFIG_AASC_DECODER),yes)
+-    OBJS+= aasc.o
++    OBJS+= aasc.lo
+ endif
+ ifeq ($(CONFIG_ALAC_DECODER),yes)
+-    OBJS+= alac.o
++    OBJS+= alac.lo
+ endif
+ ifneq ($(CONFIG_ASV1_DECODER)$(CONFIG_ASV1_ENCODER)$(CONFIG_ASV2_DECODER)$(CONFIG_ASV2_ENCODER),)
+-    OBJS+= asv1.o
++    OBJS+= asv1.lo
+ endif
+ ifeq ($(CONFIG_CINEPAK_DECODER),yes)
+-    OBJS+= cinepak.o
++    OBJS+= cinepak.lo
+ endif
+ ifneq ($(CONFIG_CLJR_DECODER)$(CONFIG_CLJR_ENCODER),)
+-    OBJS+= cljr.o
++    OBJS+= cljr.lo
+ endif
+ ifeq ($(CONFIG_CYUV_DECODER),yes)
+-    OBJS+= cyuv.o
++    OBJS+= cyuv.lo
+ endif
+ ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
+-    OBJS+= dv.o
++    OBJS+= dv.lo
+ endif
+ ifeq ($(CONFIG_EIGHTBPS_DECODER),yes)
+-    OBJS+= 8bps.o
++    OBJS+= 8bps.lo
+ endif
+ ifneq ($(CONFIG_FFV1_DECODER)$(CONFIG_FFV1_ENCODER),)
+-    OBJS+= ffv1.o
++    OBJS+= ffv1.lo
+ endif
+ ifeq ($(CONFIG_FLAC_DECODER),yes)
+-    OBJS+= flac.o
++    OBJS+= flac.lo
+ endif
+ ifeq ($(CONFIG_FLIC_DECODER),yes)
+-    OBJS+= flicvideo.o
++    OBJS+= flicvideo.lo
+ endif
+ ifeq ($(CONFIG_FOURXM_DECODER),yes)
+-    OBJS+= 4xm.o
++    OBJS+= 4xm.lo
+ endif
+ ifeq ($(CONFIG_FRAPS_DECODER),yes)
+-    OBJS+= fraps.o
++    OBJS+= fraps.lo
+ endif
+ ifneq ($(CONFIG_H261_DECODER)$(CONFIG_H261_ENCODER),)
+-    OBJS+= h261.o
++    OBJS+= h261.lo
+ endif
+ ifneq ($(CONFIG_H264_DECODER)$(CONFIG_SVQ3_DECODER),)
+-    OBJS+= h264.o
++    OBJS+= h264.lo
+ endif
+ ifneq ($(CONFIG_HUFFYUV_DECODER)$(CONFIG_HUFFYUV_ENCODER)$(CONFIG_FFVHUFF_DECODER)$(CONFIG_FFVHUFF_ENCODER),)
+-    OBJS+= huffyuv.o
++    OBJS+= huffyuv.lo
+ endif
+ ifeq ($(CONFIG_IDCIN_DECODER),yes)
+-    OBJS+= idcinvideo.o
++    OBJS+= idcinvideo.lo
+ endif
+ ifeq ($(CONFIG_INDEO2_DECODER),yes)
+-    OBJS+= indeo2.o
++    OBJS+= indeo2.lo
+ endif
+ ifeq ($(CONFIG_INDEO3_DECODER),yes)
+-    OBJS+= indeo3.o
++    OBJS+= indeo3.lo
+ endif
+ ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes)
+-    OBJS+= interplayvideo.o
++    OBJS+= interplayvideo.lo
+ endif
+ ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),)
+-    OBJS+= lcl.o
++    OBJS+= lcl.lo
+ endif
+ ifeq ($(CONFIG_LOCO_DECODER),yes)
+-    OBJS+= loco.o
++    OBJS+= loco.lo
+ endif
+ ifneq ($(CONFIG_MACE3_DECODER)$(CONFIG_MACE6_DECODER),)
+-    OBJS+= mace.o
++    OBJS+= mace.lo
+ endif
+ ifeq ($(CONFIG_MSRLE_DECODER),yes)
+-    OBJS+= msrle.o
++    OBJS+= msrle.lo
+ endif
+ ifeq ($(CONFIG_MSVIDEO1_DECODER),yes)
+-    OBJS+= msvideo1.o
++    OBJS+= msvideo1.lo
+ endif
+ ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),)
+-    OBJS+= png.o
++    OBJS+= png.lo
+ endif
+ ifeq ($(CONFIG_QDRAW_DECODER),yes)
+-    OBJS+= qdrw.o
++    OBJS+= qdrw.lo
+ endif
+ ifeq ($(CONFIG_QPEG_DECODER),yes)
+-    OBJS+= qpeg.o
++    OBJS+= qpeg.lo
+ endif
+ ifeq ($(CONFIG_QTRLE_DECODER),yes)
+-    OBJS+= qtrle.o
++    OBJS+= qtrle.lo
+ endif
+ ifeq ($(CONFIG_RA_144_DECODER),yes)
+-    OBJS+= ra144.o
++    OBJS+= ra144.lo
+ endif
+ ifeq ($(CONFIG_RA_288_DECODER),yes)
+-    OBJS+= ra288.o
++    OBJS+= ra288.lo
+ endif
+ ifeq ($(CONFIG_ROQ_DECODER),yes)
+-    OBJS+= roqvideo.o
++    OBJS+= roqvideo.lo
+ endif
+ ifeq ($(CONFIG_RPZA_DECODER),yes)
+-    OBJS+= rpza.o
++    OBJS+= rpza.lo
+ endif
+ ifneq ($(CONFIG_RV10_DECODER)$(CONFIG_RV20_DECODER)$(CONFIG_RV10_ENCODER)$(CONFIG_RV20_ENCODER),)
+-    OBJS+= rv10.o
++    OBJS+= rv10.lo
+ endif
+ ifeq ($(CONFIG_SHORTEN_DECODER),yes)
+-    OBJS+= shorten.o
++    OBJS+= shorten.lo
+ endif
+ ifeq ($(CONFIG_SMC_DECODER),yes)
+-    OBJS+= smc.o
++    OBJS+= smc.lo
+ endif
+ ifneq ($(CONFIG_SNOW_DECODER)$(CONFIG_SNOW_ENCODER),)
+-    OBJS+= snow.o
++    OBJS+= snow.lo
+ endif
+ ifneq ($(CONFIG_SONIC_DECODER)$(CONFIG_SONIC_ENCODER)$(CONFIG_SONIC_LS_ENCODER),)
+-    OBJS+= sonic.o
++    OBJS+= sonic.lo
+ endif
+ ifneq ($(CONFIG_SVQ1_DECODER)$(CONFIG_SVQ1_ENCODER),)
+-    OBJS+= svq1.o
++    OBJS+= svq1.lo
+ endif
+ ifeq ($(CONFIG_TRUEMOTION1_DECODER),yes)
+-    OBJS+= truemotion1.o
++    OBJS+= truemotion1.lo
+ endif
+ ifeq ($(CONFIG_TSCC_DECODER),yes)
+-    OBJS+= tscc.o
++    OBJS+= tscc.lo
+ endif
+ ifeq ($(CONFIG_ULTI_DECODER),yes)
+-    OBJS+= ulti.o
++    OBJS+= ulti.lo
+ endif
+ ifneq ($(CONFIG_VC9_DECODER)$(CONFIG_WMV3_DECODER),)
+-    OBJS+= vc9.o
++    OBJS+= vc9.lo
+ endif
+ ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),)
+-    OBJS+= vcr1.o
++    OBJS+= vcr1.lo
+ endif
+ ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
+-    OBJS+= vmdav.o
++    OBJS+= vmdav.lo
+ endif
+ ifeq ($(CONFIG_VORBIS_DECODER),yes)
+-    OBJS+= vorbis.o
++    OBJS+= vorbis.lo
+ endif
+ ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
+-    OBJS+= vp3.o
++    OBJS+= vp3.lo
+ endif
+ ifeq ($(CONFIG_VQA_DECODER),yes)
+-    OBJS+= vqavideo.o
++    OBJS+= vqavideo.lo
+ endif
+ ifneq ($(CONFIG_WMAV1_DECODER)$(CONFIG_WMAV2_DECODER),)
+-    OBJS+= wmadec.o
++    OBJS+= wmadec.lo
+ endif
+ ifeq ($(CONFIG_WNV1_DECODER),yes)
+-    OBJS+= wnv1.o
++    OBJS+= wnv1.lo
+ endif
+ ifeq ($(CONFIG_WS_SND1_DECODER),yes)
+-    OBJS+= ws-snd1.o
++    OBJS+= ws-snd1.lo
+ endif
+ ifneq ($(CONFIG_XAN_WC3_DECODER)$(CONFIG_XAN_WC4_DECODER),)
+-    OBJS+= xan.o
++    OBJS+= xan.lo
+ endif
+ ifeq ($(CONFIG_XL_DECODER),yes)
+-    OBJS+= xl.o
++    OBJS+= xl.lo
+ endif
+       
+       
+ AMROBJS=
  ifeq ($(AMR_NB),yes)
  ifeq ($(AMR_NB_FIXED),yes)
--OBJS+= amr.o
+-AMROBJS= amr.o
 -AMREXTRALIBS+= amr/*.o
-+OBJS+= amr.lo
++AMROBJS= amr.lo
 +AMREXTRALIBS+= amr/*.lo
  AMRLIBS=amrlibs
  CLEANAMR=cleanamr
  else
--OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
-+OBJS+= amr.lo amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
+-AMROBJS= amr.o
+-OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
++AMROBJS= amr.lo
++OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
  CLEANAMR=cleanamrfloat
  endif
  endif
@@ -123,29 +345,31 @@
 +OBJS+= w32thread.lo
  endif
  
+ ifeq ($(HAVE_BEOSTHREADS),yes)
+-OBJS+= beosthread.o
++OBJS+= beosthread.lo
+ endif
+ 
  ifeq ($(AMR_WB),yes)
--OBJS+= amr.o amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
+-AMROBJS= amr.o
+-OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
 -		amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
 -		amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
 -		amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
 -		amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
 -		amrwb_float/enc_util.o amrwb_float/if_rom.o
-+OBJS+= amr.lo amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \
++AMROBJS= amr.lo
++OBJS+= amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \
 +		amrwb_float/dec_if.lo amrwb_float/dec_lpc.lo amrwb_float/dec_main.lo \
 +		amrwb_float/dec_rom.lo amrwb_float/dec_util.lo amrwb_float/enc_acelp.lo \
 +		amrwb_float/enc_dtx.lo amrwb_float/enc_gain.lo amrwb_float/enc_if.lo \
 +		amrwb_float/enc_lpc.lo amrwb_float/enc_main.lo amrwb_float/enc_rom.lo \
 +		amrwb_float/enc_util.lo amrwb_float/if_rom.lo
  endif
+ OBJS+= $(AMROBJS)
  CLEANAMRWB=cleanamrwbfloat
  ASM_OBJS=
  
- # codecs which are patented in some non free countries like the us
- ifeq ($(CONFIG_RISKY),yes)
--OBJS+= h263.o h261.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
-+OBJS+= h263.lo h261.lo msmpeg4.lo h263dec.lo svq1.lo rv10.lo wmadec.lo indeo3.lo
- endif
- 
  ifeq ($(HAVE_XVMC_ACCEL),yes)
 -OBJS+= xvmcvideo.o
 +OBJS+= xvmcvideo.lo
@@ -165,13 +389,23 @@
  endif
  endif
  
+@@ -238,13 +238,13 @@
+ 
+ # currently using libdts for dts decoding
+ ifeq ($(CONFIG_DTS),yes)
+-OBJS+= dtsdec.o
++OBJS+= dtsdec.lo
+ CFLAGS += $(DTS_INC)
+ EXTRALIBS += -ldts
+ endif
+ 
  ifeq ($(CONFIG_FAAD),yes)
 -OBJS+= faad.o
 +OBJS+= faad.lo
  ifeq ($(CONFIG_FAADBIN),yes)
  # no libs needed
  else
-@@ -83,26 +83,27 @@
+@@ -253,17 +253,17 @@
  endif
  
  ifeq ($(CONFIG_FAAC),yes)
@@ -180,11 +414,20 @@
  EXTRALIBS += -lfaac
  endif
  
- ifeq ($(CONFIG_PP),yes)
- ifeq ($(SHARED_PP),yes)
--EXTRALIBS += -lpostproc
-+EXTRALIBS += libpostproc/libpostproc.la
-+EXTRADEPS = libpostproc/libpostproc.la
+ ifeq ($(CONFIG_XVID),yes)
+-OBJS+= xvidff.o
++OBJS+= xvidff.lo
+ EXTRALIBS += -lxvidcore
+ endif
+ 
+ ifeq ($(CONFIG_X264),yes)
+-OBJS+= x264.o
++OBJS+= x264.lo
+ EXTRALIBS += -lx264
+ endif
+ 
+@@ -272,29 +272,29 @@
+ EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
  else
  # LIBS += libpostproc/libpostproc.a ... should be fixed
 -OBJS += libpostproc/postprocess.o
@@ -198,13 +441,27 @@
  EXTRALIBS += -lmp3lame
  endif
  
- ifeq ($(CONFIG_VORBIS),yes)
+ ifeq ($(CONFIG_LIBOGG),yes)
+ ifeq ($(CONFIG_LIBVORBIS),yes)
 -OBJS += oggvorbis.o
 +OBJS += oggvorbis.lo
- EXTRALIBS += -lvorbis -lvorbisenc
+ EXTRALIBS += -lvorbisenc -lvorbis
+ endif
+ ifeq ($(CONFIG_LIBTHEORA), yes)
+-OBJS += oggtheora.o
++OBJS += oggtheora.lo
+ EXTRALIBS += -ltheora
+ endif
+ EXTRALIBS += -logg
+ endif
+ 
+ ifeq ($(CONFIG_LIBGSM),yes)
+-OBJS += libgsm.o
++OBJS += libgsm.lo
+ EXTRALIBS += -lgsm
  endif
  
-@@ -113,74 +114,76 @@
+@@ -305,30 +305,30 @@
  
  # i386 mmx specific stuff
  ifeq ($(TARGET_MMX),yes)
@@ -227,10 +484,14 @@
  
  # armv4l specific stuff
  ifeq ($(TARGET_ARCH_ARMV4L),yes)
--ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o
+-ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o armv4l/dsputil_arm_s.o
 -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
-+ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo
++ASM_OBJS += armv4l/jrevdct_arm.lo armv4l/simple_idct_arm.lo armv4l/dsputil_arm_s.lo
 +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
+ ifeq ($(TARGET_IWMMXT),yes)
+-OBJS += armv4l/dsputil_iwmmxt.o armv4l/mpegvideo_iwmmxt.o
++OBJS += armv4l/dsputil_iwmmxt.lo armv4l/mpegvideo_iwmmxt.lo
+ endif
  endif
  
  # sun mediaLib specific stuff
@@ -241,6 +502,8 @@
  CFLAGS += $(MLIB_INC)
  endif
  
+@@ -340,82 +340,71 @@
+ 
  # alpha specific stuff
  ifeq ($(TARGET_ARCH_ALPHA),yes)
 -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
@@ -249,7 +512,7 @@
 +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
 +	alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
 +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
- CFLAGS += -fforce-addr -freduce-all-givs
+ CFLAGS += -fforce-addr
  endif
  
  ifeq ($(TARGET_ARCH_POWERPC),yes)
@@ -264,9 +527,11 @@
  
  ifeq ($(TARGET_ALTIVEC),yes)
 -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
--        ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o
+-        ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o \
+-        ppc/dsputil_h264_altivec.o
 +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo \
-+        ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo
++        ppc/fft_altivec.lo ppc/gmc_altivec.lo ppc/fdct_altivec.lo \
++        ppc/dsputil_h264_altivec.lo
  endif
  
  ifeq ($(TARGET_ARCH_SH4),yes)
@@ -280,7 +545,7 @@
 -	$(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< 
 +OBJS+=sparc/dsputil_vis.lo
 +sparc/%.lo: sparc/%.c
-+	libtool --mode=compile $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
++	libtool --mode=compile $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< 
  endif
  ifeq ($(TARGET_ARCH_SPARC64),yes)
  CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
@@ -291,7 +556,9 @@
  OBJS := $(OBJS) $(ASM_OBJS)
  
 -LIB= $(LIBPREF)avcodec$(LIBSUF)
+-LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 +LIB= libavcodec.la
++LIBAVUTIL= $(SRC_PATH)/libavutil/libavutil.la
  ifeq ($(BUILD_SHARED),yes)
 -SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
 +RPATH= -rpath $(libdir)
@@ -305,24 +572,27 @@
  
  amrlibs:
  	$(MAKE) -C amr spclib fipoplib
-@@ -188,28 +191,18 @@
+ 
  tests: apiexample cpuid_test $(TESTS)
  
 -$(LIB): $(OBJS) $(AMRLIBS)
 -	rm -f $@
 -	$(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
 -	$(RANLIB) $@
--
++$(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS)
++	libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
+ 
 -$(SLIB): $(OBJS)
+-ifeq ($(CONFIG_PP),yes)
+-	$(MAKE) -C libpostproc
+-endif
 -ifeq ($(CONFIG_WIN32),yes)
 -	$(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)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ffmpeg-libtool.patch?r1=1.9&r2=1.9.2.1&f=u

More information about the pld-cvs-commit mailing list