SOURCES: ffmpeg-libtool.patch - ah, merge from DEVEL
glen
glen at pld-linux.org
Tue Dec 5 12:41:54 CET 2006
Author: glen Date: Tue Dec 5 11:41:54 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- ah, merge from DEVEL
---- Files affected:
SOURCES:
ffmpeg-libtool.patch (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SOURCES/ffmpeg-libtool.patch
diff -u SOURCES/ffmpeg-libtool.patch:1.14 SOURCES/ffmpeg-libtool.patch:1.15
--- SOURCES/ffmpeg-libtool.patch:1.14 Sun May 28 14:01:14 2006
+++ SOURCES/ffmpeg-libtool.patch Tue Dec 5 12:41:48 2006
@@ -1,646 +1,161 @@
---- ffmpeg/libavcodec/libpostproc/Makefile.orig 2006-01-27 00:42:28.000000000 +0100
-+++ ffmpeg/libavcodec/libpostproc/Makefile 2006-01-29 13:37:17.993360000 +0100
-@@ -4,25 +4,22 @@
- VPATH=$(SRC_PATH)/libavcodec/libpostproc
-
- NAME=postproc
--ifeq ($(BUILD_SHARED),yes)
- LIBVERSION=$(SPPVERSION)
- LIBMAJOR=$(SPPMAJOR)
--endif
-
--OBJS=postprocess.o
--SOBJS=postprocess_pic.o
-+OBJS=postprocess.lo
-
- CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
- # -I/usr/X11R6/include/
-
- .SUFFIXES: .c .o
-
- # .PHONY: all clean
-
--.c.o:
-- $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
-+%.lo : %.c
-+ libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
-
--all: $(SWSLIB) $(LIB) $(SLIBNAME)
-+all: $(SWSLIB) $(LIB)
-
- clean:
- rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
-@@ -36,37 +33,21 @@
- $(CC) -MM $(CFLAGS) postprocess.c 1>.depend
+--- ffmpeg-export-2006-12-04/Makefile 2006-11-20 23:46:43.000000000 +0200
++++ ffmpeg-export-2006-12-04.libtool2/Makefile 2006-12-05 13:08:44.141688603 +0200
+@@ -13,7 +13,6 @@
- ifeq ($(BUILD_SHARED),yes)
--postprocess_pic.o: postprocess.c
-- $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
--
--$(SLIBNAME): $(SOBJS)
-- $(CC) $(SHFLAGS) -o $(SLIBNAME) $(SOBJS)
-+RPATH= -rpath $(libdir)
-+else
-+RPATH=
+ ifeq ($(CONFIG_FFMPEG),yes)
+ MANPAGES=doc/ffmpeg.1
+-PROGS_G+=ffmpeg_g$(EXESUF)
+ PROGS+=ffmpeg$(EXESUF)
endif
- $(LIB): $(OBJS)
-- rm -f $@
-- $(AR) rc $@ $(OBJS)
-- $(RANLIB) $@
-+ libtool --mode=link --tag=CC $(CC) -o $(LIB) $(OBJS) $(RPATH) -version-number `echo $(LIBVERSION) | tr . :`
+@@ -24,13 +23,11 @@
- install: all
--ifeq ($(BUILD_SHARED),yes)
--ifeq ($(CONFIG_WIN32),yes)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
--else
-- install -d $(libdir)
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- $(libdir)/$(SLIBNAME_WITH_VERSION)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME)
-- $(LDCONFIG) || true
--endif
--endif
-- mkdir -p $(prefix)/include/postproc
-- install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
-- install -d $(libdir)/pkgconfig
-- install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
-+ install -d $(DESTDIR)$(libdir)
-+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
-+ install -d $(DESTDIR)$(prefix)/include/postproc
-+ install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(DESTDIR)$(prefix)/include/postproc/postprocess.h
-+ install -d $(DESTDIR)$(libdir)/pkgconfig
-+ install -m 644 ../../libpostproc.pc $(DESTDIR)$(libdir)/pkgconfig
-
-
- #
---- ffmpeg/libavcodec/Makefile.orig 2006-01-27 00:42:28.000000000 +0100
-+++ ffmpeg/libavcodec/Makefile 2006-01-29 13:45:46.901164750 +0100
-@@ -9,311 +9,312 @@
- # NOTE: -I.. is needed to include config.h
- 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= 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 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 \
-- opt.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 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 \
-+ opt.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
- ifeq ($(CONFIG_COOK_DECODER),yes)
-- OBJS+= cook.o
-+ OBJS+= cook.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
- ifeq ($(CONFIG_DVBSUB_DECODER),yes)
-- OBJS+= dvbsubdec.o
-+ OBJS+= dvbsubdec.lo
- endif
- ifeq ($(CONFIG_DVBSUB_ENCODER),yes)
-- OBJS+= dvbsub.o
-+ OBJS+= dvbsub.lo
- endif
- ifeq ($(CONFIG_DVDSUB_DECODER),yes)
-- OBJS+= dvdsub.o
-+ OBJS+= dvdsub.lo
- endif
- ifeq ($(CONFIG_DVDSUB_ENCODER),yes)
-- OBJS+= dvdsubenc.o
-+ OBJS+= dvdsubenc.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_QDM2_DECODER),yes)
-- OBJS+= qdm2.o
-+ OBJS+= qdm2.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_TRUEMOTION2_DECODER),yes)
-- OBJS+= truemotion2.o
-+ OBJS+= truemotion2.lo
- endif
- ifeq ($(CONFIG_TRUESPEECH_DECODER),yes)
-- OBJS+= truespeech.o
-+ OBJS+= truespeech.lo
- endif
- ifeq ($(CONFIG_TSCC_DECODER),yes)
-- OBJS+= tscc.o
-+ OBJS+= tscc.lo
- endif
- ifeq ($(CONFIG_CSCD_DECODER),yes)
-- OBJS+= cscd.o
-- OBJS+= lzo.o
-+ OBJS+= cscd.lo
-+ OBJS+= lzo.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
- ifeq ($(CONFIG_BMP_DECODER),yes)
-- OBJS+= bmp.o
-+ OBJS+= bmp.lo
- endif
-
- AMROBJS=
- ifeq ($(AMR_NB),yes)
- ifeq ($(AMR_NB_FIXED),yes)
--AMROBJS= amr.o
--AMREXTRALIBS+= amr/*.o
-+AMROBJS= amr.lo
-+AMREXTRALIBS+= amr/*.lo
- AMRLIBS=amrlibs
- CLEANAMR=cleanamr
- else
--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
-
- ifeq ($(HAVE_PTHREADS),yes)
--OBJS+= pthread.o
-+OBJS+= pthread.lo
- endif
-
- ifeq ($(HAVE_W32THREADS),yes)
--OBJS+= w32thread.o
-+OBJS+= w32thread.lo
- endif
-
- ifeq ($(HAVE_BEOSTHREADS),yes)
--OBJS+= beosthread.o
-+OBJS+= beosthread.lo
- endif
-
- ifeq ($(AMR_WB),yes)
--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
-+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=
-
- ifeq ($(HAVE_XVMC_ACCEL),yes)
--OBJS+= xvmcvideo.o
-+OBJS+= xvmcvideo.lo
+ ifeq ($(CONFIG_FFPLAY),yes)
+ MANPAGES+=doc/ffplay.1
+-PROGS_G+=ffplay_g$(EXESUF)
+ PROGS+=ffplay$(EXESUF)
endif
- # currently using liba52 for ac3 decoding
- ifeq ($(CONFIG_AC3),yes)
--OBJS+= a52dec.o
-+OBJS+= a52dec.lo
-
- # using builtin liba52 or runtime linked liba52.so.0
- ifneq ($(CONFIG_A52BIN),yes)
--OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
-- liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
-+OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
-+ liba52/imdct.lo liba52/parse.lo liba52/crc.lo liba52/resample.lo
- endif
- endif
-
--EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
-+EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
-
- # currently using libdts for dts decoding
- ifeq ($(CONFIG_DTS),yes)
--OBJS+= dtsdec.o
-+OBJS+= dtsdec.lo
- CFLAGS += $(DTS_INC)
- endif
+ BASENAMES=ffmpeg ffplay ffserver
+ ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
+-ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
+ ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
- ifeq ($(CONFIG_FAAD),yes)
--OBJS+= faad.o
-+OBJS+= faad.lo
- endif
-
- ifeq ($(CONFIG_FAAC),yes)
--OBJS+= faac.o
-+OBJS+= faac.lo
- endif
-
- ifeq ($(CONFIG_XVID),yes)
--OBJS+= xvidff.o
--OBJS+= xvid_rc.o
-+OBJS+= xvidff.lo
-+OBJS+= xvid_rc.lo
+ ifeq ($(BUILD_SHARED),yes)
+@@ -49,17 +46,15 @@
+ INSTALLMAN=install-man
endif
- ifeq ($(CONFIG_X264),yes)
--OBJS+= x264.o
-+OBJS+= x264.lo
+-OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
+-SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+-LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+-EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
++OBJS = ffmpeg.lo ffserver.lo cmdutils.lo ffplay.lo
++SRCS = $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.s)
++EXTRALIBS := $(BUILD_ROOT)/libavformat/libavformat.la $(BUILD_ROOT)/libavcodec/libavcodec.la $(BUILD_ROOT)/libavutil/libavutil.la $(EXTRALIBS)
+
+ ifeq ($(CONFIG_SWSCALER),yes)
+-LDFLAGS+=-L./libswscale
+-EXTRALIBS+=-lswscale$(BUILDSUF)
++EXTRALIBS+= $(BUILD_ROOT)/libswscale/libswscale.la
+ endif
+
+-all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC)
++all: lib $(PROGS) $(VHOOK) $(DOC)
+
+ lib:
+ $(MAKE) -C libavutil all
+@@ -72,40 +67,42 @@
+ $(MAKE) -C libswscale all
endif
- ifeq ($(CONFIG_PP),yes)
- ifeq ($(BUILD_SHARED),yes)
--EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
-+EXTRALIBS += libpostproc/libpostproc.la
-+EXTRADEPS += libpostproc/libpostproc.la
- else
- # LIBS += libpostproc/libpostproc.a ... should be fixed
--OBJS += libpostproc/postprocess.o
-+OBJS += libpostproc/postprocess.lo
- endif
- endif
+-ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
++ffmpeg$(EXESUF): ffmpeg.lo cmdutils.lo
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
- ifeq ($(CONFIG_MP3LAME),yes)
--OBJS += mp3lameaudio.o
-+OBJS += mp3lameaudio.lo
- endif
+-ffserver$(EXESUF): ffserver.o .libs
+- $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
++ffserver$(EXESUF): ffserver.lo libavformat/libavformat.la libavcodec/libavcodec.la
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ $^ $(EXTRALIBS)
- ifeq ($(CONFIG_LIBOGG),yes)
- ifeq ($(CONFIG_LIBVORBIS),yes)
--OBJS += oggvorbis.o
-+OBJS += oggvorbis.lo
- endif
- ifeq ($(CONFIG_LIBTHEORA), yes)
--OBJS += oggtheora.o
-+OBJS += oggtheora.lo
- endif
- endif
+-ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
+- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
++libavformat/libavformat.la:
++ $(MAKE) -C libavformat all
++
++libavcodec/libavcodec.la:
++ $(MAKE) -C libavcodec all
- ifeq ($(CONFIG_LIBGSM),yes)
--OBJS += libgsm.o
-+OBJS += libgsm.lo
- endif
+-%$(EXESUF): %_g$(EXESUF)
+- cp -p $< $@
+- $(STRIP) $@
++ffplay$(EXESUF): ffplay.lo cmdutils.lo
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(SDL_LIBS)
- ifeq ($(TARGET_GPROF),yes)
-@@ -323,33 +324,33 @@
+ version.h:
+ $(SRC_PATH)/version.sh $(SRC_PATH)
- # i386 mmx specific stuff
- ifeq ($(TARGET_MMX),yes)
--OBJS += i386/fdct_mmx.o i386/cputest.o \
-- i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
-- i386/idct_mmx.o i386/motion_est_mmx.o \
-- i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
-- i386/vp3dsp_sse2.o
-+OBJS += i386/fdct_mmx.lo i386/cputest.lo \
-+ i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
-+ i386/idct_mmx.lo i386/motion_est_mmx.lo \
-+ i386/simple_idct_mmx.lo i386/fft_sse.lo i386/vp3dsp_mmx.lo \
-+ i386/vp3dsp_sse2.lo
- ifeq ($(CONFIG_GPL),yes)
--OBJS += i386/idct_mmx_xvid.o
-+OBJS += i386/idct_mmx_xvid.lo
- endif
- ifdef TARGET_BUILTIN_VECTOR
--i386/fft_sse.o: CFLAGS+= -msse
-+i386/fft_sse.lo: CFLAGS+= -msse
- depend: CFLAGS+= -msse
- endif
- endif
+-output_example$(EXESUF): output_example.o .libs
+- $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
++output_example$(EXESUF): output_example.lo
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/ffmpeg-libtool.patch?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list