--- /dev/null
+--- ffmpeg-0.4.6/libavcodec/Makefile.orig Sun Jan 5 02:32:23 2003
++++ ffmpeg-0.4.6/libavcodec/Makefile Sun Jan 5 02:49:11 2003
+@@ -10,33 +10,33 @@
+ CFLAGS= $(OPT) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ LDFLAGS= $(LDOPT)
+
+-OBJS= common.o utils.o mem.o allcodecs.o \
+- mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
+- mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
+- motion_est.o imgconvert.o imgresample.o msmpeg4.o \
+- mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
+- ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
+- wmadec.o fft.o mdct.o mace.o huffyuv.o
++OBJS= common.lo utils.lo mem.lo allcodecs.lo \
++ mpegvideo.lo h263.lo jrevdct.lo jfdctfst.lo jfdctint.lo\
++ mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo dsputil.lo \
++ motion_est.lo imgconvert.lo imgresample.lo msmpeg4.lo \
++ mpeg12.lo h263dec.lo svq1.lo rv10.lo mpegaudiodec.lo pcm.lo simple_idct.lo \
++ ratecontrol.lo adpcm.lo eval.lo dv.lo error_resilience.lo \
++ wmadec.lo fft.lo mdct.lo mace.lo huffyuv.lo
+ ASM_OBJS=
+
+ # 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
++OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
++ liba52/imdct.lo liba52/parse.lo
+ endif
+ endif
+
+ ifeq ($(CONFIG_MP3LAME),yes)
+-OBJS += mp3lameaudio.o
++OBJS += mp3lameaudio.lo
+ EXTRALIBS += -lmp3lame
+ endif
+
+ ifeq ($(CONFIG_VORBIS),yes)
+-OBJS += oggvorbis.o
++OBJS += oggvorbis.lo
+ EXTRALIBS += -lvorbis -lvorbisenc
+ endif
+
+@@ -47,52 +47,54 @@
+
+ # 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
++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
+ endif
+
+ # armv4l specific stuff
+ ifeq ($(TARGET_ARCH_ARMV4L),yes)
+-ASM_OBJS += armv4l/jrevdct_arm.o
+-OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
++ASM_OBJS += armv4l/jrevdct_arm.lo
++OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
+ endif
+
+ # sun mediaLib specific stuff
+ # currently only works when libavcodec is used in mplayer
+ ifeq ($(HAVE_MLIB),yes)
+-OBJS += mlib/dsputil_mlib.o
++OBJS += mlib/dsputil_mlib.lo
+ CFLAGS += $(MLIB_INC)
+ endif
+
+ # alpha specific stuff
+ ifeq ($(TARGET_ARCH_ALPHA),yes)
+-OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
+- alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
+-ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
++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
+ endif
+
+ ifeq ($(TARGET_ARCH_POWERPC),yes)
+-OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
++OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
+ endif
+
+ ifeq ($(TARGET_MMI),yes)
+-OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
++OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
+ endif
+
+ ifeq ($(TARGET_ALTIVEC),yes)
+ CFLAGS += -faltivec
+-OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o
++OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo
+ endif
+
+-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
++SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
+ OBJS := $(OBJS) $(ASM_OBJS)
+
+-LIB= libavcodec.a
++LIB= libavcodec.la
+ ifeq ($(BUILD_SHARED),yes)
+-SLIB= libavcodec.so
++RPATH= -rpath $(prefix)/lib libavcodec.so
++else
++RPATH=
+ endif
+ TESTS= imgresample-test dct-test motion-test fft-test
+
+@@ -101,38 +103,33 @@
+ tests: apiexample cpuid_test $(TESTS)
+
+ $(LIB): $(OBJS)
+- rm -f $@
+- $(AR) rc $@ $(OBJS)
+- $(RANLIB) $@
++ libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
+
+-$(SLIB): $(OBJS)
+- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+-
+-dsputil.o: dsputil.c dsputil.h
++dsputil.lo: dsputil.c dsputil.h
+
+ # specific sse code
+-%_sse.o : %_sse.c
+- $(CC) $(CFLAGS) -msse -c -o $@ $<
++%_sse.lo : %_sse.c
++ libtool --mode=compile $(CC) $(CFLAGS) -msse -c -o $@ $<
+
+ # specific 3dnow code
+-%_3dnow.o : %_3dnow.c
+- $(CC) $(CFLAGS) -m3dnow -c -o $@ $<
++%_3dnow.lo : %_3dnow.c
++ libtool --mode=compile $(CC) $(CFLAGS) -m3dnow -c -o $@ $<
+
+-%.o: %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
++%.lo: %.c
++ libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
+
+-%.o: %.S
+- $(CC) $(CFLAGS) -c -o $@ $<
++%.lo: %.S
++ libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
+
+ # motion_est_alpha uses the MVI extension, which is not available with
+ # -mcpu=ev4 (default) or ev5/ev56. Thus, force -mcpu=pca56 in those
+ # cases.
+ ifeq ($(TARGET_ARCH_ALPHA),yes)
+-alpha/motion_est_alpha.o: alpha/motion_est_alpha.c
++alpha/motion_est_alpha.lo: alpha/motion_est_alpha.c
+ cpu=`echo "$(CFLAGS)" | sed -n 's,.*-mcpu=\([a-zA-Z0-9]*\).*,\1,p'`; \
+ case x"$$cpu" in x|xev[45]*) newcpu=pca56;; *) newcpu=$$cpu;; esac; \
+ echo $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<;\
+- $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
++ libtool --mode=compile $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
+ endif
+
+ # depend only used by mplayer now
+@@ -142,13 +139,13 @@
+ $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+ clean:
+- rm -f *.o *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
+- armv4l/*.o armv4l/*~ \
+- mlib/*.o mlib/*~ \
+- alpha/*.o alpha/*~ \
+- ppc/*.o ppc/*~ \
+- ps2/*.o ps2/*~ \
+- liba52/*.o liba52/*~ \
++ rm -f *.*o *~ .depend $(LIB) $(SLIB) *.so *.la i386/*.*o i386/*~ \
++ armv4l/*.*o armv4l/*~ \
++ mlib/*.*o mlib/*~ \
++ alpha/*.*o alpha/*~ \
++ ppc/*.*o ppc/*~ \
++ ps2/*.*o ps2/*~ \
++ liba52/*.*o liba52/*~ \
+ apiexample $(TESTS)
+
+ distclean: clean
+@@ -156,43 +153,41 @@
+
+ # api example program
+ apiexample: apiexample.c $(LIB)
+- $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
++ libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
+
+ # cpuid test
+ cpuid_test: i386/cputest.c
+- $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
++ libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -D__TEST__ -o $@ $<
+
+ # testing progs
+
+ imgresample-test: imgresample.c
+- $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
++ libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ $^ -lm
+
+ dct-test: dct-test.o jfdctfst.o jfdctint.o i386/fdct_mmx.o\
+ fdctref.o jrevdct.o i386/idct_mmx.o simple_idct.o i386/simple_idct_mmx.o
+- $(CC) -o $@ $^ -lm
++ libtool --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm
+
+ motion-test: motion_test.o $(LIB)
+- $(CC) -o $@ $^ -lm
++ libtool --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm
+
+ fft-test: fft-test.o fft.o mdct.o
+- $(CC) -o $@ $^ -lm
++ libtool --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm
+
+ install: all
+ ifeq ($(BUILD_SHARED),yes)
+- install -d $(prefix)/lib
+- install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+- ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
+- ldconfig || true
+- mkdir -p $(prefix)/include/ffmpeg
+- install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
+- install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
++ install -d $(DESTDIR)$(prefix)/lib
++ libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
++ install -d $(DESTDIR)$(prefix)/include/ffmpeg
++ install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
++ install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
+ endif
+
+ installlib: all
+- install -m 644 $(LIB) $(prefix)/lib
+- mkdir -p $(prefix)/include/ffmpeg
++ libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
++ install -d $(DESTDIR)$(prefix)/include/ffmpeg
+ install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
+- $(prefix)/include/ffmpeg
++ $(DESTDIR)$(prefix)/include/ffmpeg
+
+ #
+ # include dependency files if they exist
+--- ffmpeg-0.4.6/libavformat/Makefile.orig Sun Jan 5 02:32:23 2003
++++ ffmpeg-0.4.6/libavformat/Makefile Sun Jan 5 02:53:50 2003
+@@ -8,65 +8,66 @@
+
+ CFLAGS= $(OPT) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+
+-OBJS= utils.o cutils.o allformats.o
++OBJS= utils.lo cutils.lo allformats.lo
+
+ # mux and demuxes
+-OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o asf.o \
+- avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o dv.o framehook.o
++OBJS+=mpeg.lo mpegts.lo ffm.lo crc.lo img.lo raw.lo rm.lo asf.lo \
++ avienc.lo avidec.lo wav.lo swf.lo au.lo gif.lo mov.lo jpeg.lo dv.lo framehook.lo
+ # file I/O
+-OBJS+= avio.o aviobuf.o file.o
++OBJS+= avio.lo aviobuf.lo file.lo
+
+ ifeq ($(BUILD_STRPTIME),yes)
+-OBJS+= strptime.o
++OBJS+= strptime.lo
+ endif
+
+ ifeq ($(CONFIG_VIDEO4LINUX),yes)
+-OBJS+= grab.o
++OBJS+= grab.lo
+ endif
+
+ ifeq ($(CONFIG_AUDIO_OSS),yes)
+-OBJS+= audio.o
++OBJS+= audio.lo
+ endif
+
+ ifeq ($(CONFIG_AUDIO_BEOS),yes)
+-OBJS+= beosaudio.o
++OBJS+= beosaudio.lo
+ endif
+
+ ifeq ($(CONFIG_NETWORK),yes)
+-OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
++OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
+ # BeOS network stuff
+ ifeq ($(NEED_INET_ATON),yes)
+-OBJS+= barpainet.o
++OBJS+= barpainet.lo
+ endif
+ endif
+
+ ifeq ($(CONFIG_VORBIS),yes)
+-OBJS+= ogg.o
++OBJS+= ogg.lo
+ endif
+
+-LIB= libavformat.a
++LIB= libavformat.la
+
+ all: $(LIB)
+
+ $(LIB): $(OBJS)
+- rm -f $@
+- $(AR) rc $@ $(OBJS)
+- $(RANLIB) $@
+-
+-installlib: all
+- install -m 644 $(LIB) $(prefix)/lib
+- mkdir -p $(prefix)/include/ffmpeg
+- install -m 644 $(SRC_PATH)/libav/avformat.h $(SRC_PATH)/libav/avio.h \
+- $(SRC_PATH)/libav/rtp.h $(SRC_PATH)/libav/rtsp.h \
+- $(SRC_PATH)/libav/rtspcodes.h \
+- $(prefix)/include/ffmpeg
++ libtool --mode=link $(CC) $(LDOPT) -o $@ $(OBJS) ../libavcodec/libavcodec.la -rpath $(prefix)/lib -release $(VERSION)
++
++install: all
++ install -d $(DESTDIR)$(prefix)/lib
++ libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
++ install -d $(DESTDIR)$(prefix)/include/ffmpeg
++ install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
++ $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
++ $(SRC_PATH)/libavformat/rtspcodes.h \
++ $(DESTDIR)$(prefix)/include/ffmpeg
++
++installlib: install
+
+-%.o: %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
++%.lo: %.c
++ libtool --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
+
+ # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
+ %.o: %.cpp
+- g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
++ libtool --mode=compile g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
+
+ clean:
+- rm -f *.o *~ *.a
++ rm -f *.o *.lo *~ *.a *.la *.so
+--- ffmpeg-0.4.6/Makefile.orig Sun Jan 5 02:32:23 2003
++++ ffmpeg-0.4.6/Makefile Sun Jan 5 03:01:25 2003
+@@ -19,7 +19,7 @@
+ PROG=ffmpeg$(EXE)
+ else
+ EXT=
+-PROG=ffmpeg ffplay
++PROG=ffmpeg
+ ifeq ($(CONFIG_FFSERVER),yes)
+ PROG+=ffserver
+ endif
+@@ -30,7 +30,7 @@
+ endif
+
+ ifeq ($(BUILD_SHARED),yes)
+-DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a
++DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
+ else
+ DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a
+ ifeq ($(CONFIG_MP3LAME),yes)
+@@ -56,17 +56,12 @@
+ $(MAKE) -C libavcodec all
+ $(MAKE) -C libavformat all
+
+-ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
+- $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
+- -lavformat -lavcodec $(EXTRALIBS)
+-
+-ffmpeg$(EXE): ffmpeg_g$(EXE)
+- cp -p $< $@ ; $(STRIP) $@
++ffmpeg$(EXE): ffmpeg.o $(DEP_LIBS)
++ libtool --mode=link $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(DEP_LIBS) $(EXTRALIBS)
+
+ ffserver$(EXE): ffserver.o $(DEP_LIBS)
+- $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
+- -o $@ ffserver.o -L./libavcodec -L./libavformat \
+- -lavformat -lavcodec $(EXTRALIBS)
++ libtool --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
++ -o $@ ffserver.o $(DEP_LIBS) $(EXTRALIBS)
+
+ ffplay: ffmpeg$(EXE)
+ ln -sf $< $@
+@@ -79,14 +74,15 @@
+
+-install: all $(INSTALLVHOOK)
++install: $(INSTALLVHOOK)
+ $(MAKE) -C libavcodec install
+- install -d $(prefix)/bin
+- install -s -m 755 $(PROG) $(prefix)/bin
+- ln -sf ffmpeg $(prefix)/bin/ffplay
++ $(MAKE) -C libavformat install
++ install -d $(DESTDIR)$(prefix)/bin
++ libtool --mode=install install $(PROG) $(DESTDIR)$(prefix)/bin
++ ln -sf ffmpeg $(DESTDIR)$(prefix)/bin/ffplay
+
+-install-vhook: $(prefix)/lib/vhook
+- $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
++install-vhook: $(DESTDIR)$(prefix)/lib/vhook
++ $(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook
+
+-$(prefix)/lib/vhook:
++$(DESTDIR)$(prefix)/lib/vhook:
+ install -d $@
+
+ installlib:
-diff -urN ffmpeg/Makefile ffmpeg.new/Makefile
---- ffmpeg/Makefile Wed Aug 15 15:12:07 2001
-+++ ffmpeg.new/Makefile Wed Sep 5 13:51:41 2001
-@@ -3,8 +3,8 @@
- #
- include config.mak
-
--CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav
--LDFLAGS= -g
-+CFLAGS= $(OPT) -Wall -I./libavcodec -I./libav
-+LDFLAGS= $(LDOPT)
+--- ffmpeg-0.4.6/Makefile.orig Fri Dec 27 15:35:45 2002
++++ ffmpeg-0.4.6/Makefile Sun Jan 5 01:23:59 2003
+@@ -6,8 +6,8 @@
+
+ VPATH=$(SRC_PATH)
+
+-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+-LDFLAGS+= -g
++CFLAGS= $(OPT) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++LDFLAGS+= $(LDOPT)
+
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
- LDFLAGS+=-p
-@@ -19,16 +19,16 @@
- $(MAKE) -C libav all
-
- ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a
-- gcc $(LDFLAGS) -o $@ $^ -lm
-+ $(CC) $(LDFLAGS) -o $@ $^ -lm
-
- ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a
-- gcc $(LDFLAGS) -o $@ $^ -lm
-+ $(CC) $(LDFLAGS) -o $@ $^ -lm
-
- %.o: %.c
-- gcc $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-
- install: all
-- install -s -m 755 $(PROG) $(prefix)/bin
-+ install -m 755 $(PROG) $(prefix)/bin
-
- clean:
- $(MAKE) -C libavcodec clean
-diff -urN ffmpeg/libav/Makefile ffmpeg.new/libav/Makefile
---- ffmpeg/libav/Makefile Wed Aug 15 00:32:50 2001
-+++ ffmpeg.new/libav/Makefile Wed Sep 5 13:47:25 2001
-@@ -1,5 +1,5 @@
- include ../config.mak
--CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H
-+CFLAGS= $(OPT) -Wall -I../libavcodec -DHAVE_AV_CONFIG_H
-
- OBJS= rm.o mpeg.o asf.o avienc.o jpeg.o swf.o wav.o raw.o \
- avidec.o ffm.o \
-diff -urN ffmpeg/libavcodec/Makefile ffmpeg.new/libavcodec/Makefile
---- ffmpeg/libavcodec/Makefile Mon Aug 13 00:52:36 2001
-+++ ffmpeg.new/libavcodec/Makefile Wed Sep 5 13:47:34 2001
-@@ -1,7 +1,7 @@
- include ../config.mak
-
--CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H
+--- ffmpeg-0.4.6/libavcodec/Makefile.orig Fri Dec 27 15:35:45 2002
++++ ffmpeg-0.4.6/libavcodec/Makefile Sun Jan 5 01:24:39 2003
+@@ -7,8 +7,8 @@
+ VPATH=$(SRC_PATH)/libavcodec
+
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-LDFLAGS= -g
-+CFLAGS= $(OPT) -Wall -DHAVE_AV_CONFIG_H
++CFLAGS= $(OPT) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+LDFLAGS= $(LDOPT)
- OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \
- mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
+ OBJS= common.o utils.o mem.o allcodecs.o \
+ mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
+--- ffmpeg-0.4.6/libavformat/Makefile.orig Fri Dec 27 15:35:47 2002
++++ ffmpeg-0.4.6/libavformat/Makefile Sun Jan 5 01:25:07 2003
+@@ -6,7 +6,7 @@
+
+ VPATH=$(SRC_PATH)/libavformat
+
+-CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS= $(OPT) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+
+ OBJS= utils.o cutils.o allformats.o
+
+--- ffmpeg-0.4.6/vhook/Makefile.orig Fri Dec 27 15:35:47 2002
++++ ffmpeg-0.4.6/vhook/Makefile Sun Jan 5 02:56:56 2003
+@@ -2,7 +2,7 @@
+
+ VPATH=$(SRC_PATH)/vhook
+
+-CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
++CFLAGS=-fPIC $(OPT) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
+
+ ifeq ($(CONFIG_DARWIN),yes)
+ SHFLAGS+=-bundle -flat_namespace -undefined suppress
+@@ -16,14 +16,14 @@
+ all: $(HOOKS)
+
+ install:
+- install -s -m 755 $(HOOKS) $(INSTDIR)
++ install -m 755 $(HOOKS) $(INSTDIR)
+
+ imlib2.so: imlib2.o
+- $(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
++ $(CC) $(LDOPT) -o $@ $(SHFLAGS) $< -lImlib2
+ rm $<
+
+ %.so: %.o
+- $(CC) -g -o $@ $(SHFLAGS) $<
++ $(CC) $(LDOPT) -o $@ $(SHFLAGS) $<
+
+ %.html: %.texi
+ texi2html -monolithic -number $<
Summary: Realtime audio/video encoder and streaming server
Summary(pl): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
Name: ffmpeg
-Version: 0.4.5
-Release: 3
-License: GPL
+Version: 0.4.6
+Release: 1
+License: LGPL/GPL
Group: Daemons
-Source0: http://prdownloads.sourceforge.net/ffmpeg/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.sourceforge.net/pub/sourceforge/ffmpeg/%{name}-%{version}.tar.gz
Patch0: %{name}-opt.patch
+Patch1: %{name}-imlib2.patch
+Patch2: %{name}-libtool.patch
URL: http://ffmpeg.sourceforge.net/
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: imlib2-devel
+BuildRequires: libtool >= 1:1.4.2-9
%ifarch i586 i686 athlon
BuildRequires: nasm
%endif
+BuildRequires: zlib-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
ffmpeg is a hyper fast realtime audio/video encoder and streaming
encoding. Sound is compressed in MPEG audio layer 2 or using an AC3
compatible stream.
+This package contains also ffmpeg shared libraries (libavcodec and
+libavformat).
+
%description -l pl
ffmpeg jest bardzo szybkim koderem audio/wideo w czasie rzeczywistym
oraz serwerem strumieni multimedialnych. ffmpeg potrafi zrzucaæ dane
jest kompresowany do strumienia MPEG audio layer 2 lub u¿ywaj±c
strumienia kompatybilnego z AC3.
+Ten pakiet zawiera tak¿e biblioteki wspó³dzielone ffmpeg (libavcodec i
+libavformat).
+
+%package vhook-imlib2
+Summary: imlib2 based hook
+Summary(pl): Modu³ przej¶ciowy oparty o imlib2
+Group: Libraries
+Requires: %{name} = %{version}
+
+%description vhook-imlib2
+This module implements a text overlay for a video image. Currently it
+supports a fixed overlay or reading the text from a file. The string
+is passed through strftime so that it is easy to imprint the date and
+time onto the image.
+
+%description vhook-imlib2 -l pl
+Ten modu³ implementuje tekstow± nak³adkê dla obrazu. Aktualnie
+obs³uguje sta³± nak³adkê lub wczytywanie tekstu z pliku. £añcuch jest
+przepuszczany przez strftime, wiêc ³atwo umie¶ciæ datê i czas na
+obrazie.
+
+%package devel
+Summary: ffmpeg header files
+Summary(pl): Pliki nag³ówkowe ffmpeg
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description devel
+ffmpeg header files.
+
+%description devel -l pl
+Pliki nag³ówkowe ffmpeg.
+
+%package static
+Summary: ffmpeg static libraries
+Summary(pl): Statyczne biblioteki ffmpeg
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}
+
+%description static
+ffmpeg static libraries (libavcodec and libavformat).
+
+%description static -l pl
+Statyczne biblioteki ffmpeg (libavcodec i libavformat).
+
%prep
-%setup -q -n %{name}
-%patch -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
+# note: it's not autoconf configure
./configure \
+ --prefix=%{_prefix} \
+ --enable-shared \
+ --enable-a52bin \
%ifnarch i586 i686 athlon
--disable-mmx
%endif
+# note: -fomit-frame-pointer is always needed on x86 due to lack of registers
+# (-fPIC takes one)
%{__make} \
- OPT="%{rpmcflags}" \
- LDOPT="%{rpmldflags}"
+ OPT="%{rpmcflags} -fomit-frame-pointer -I/usr/X11R6/include" \
+ LDOPT="%{rpmldflags} -L/usr/X11R6/lib"
+
+%{__make} -C doc
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir}}
-install ffmpeg $RPM_BUILD_ROOT%{_bindir}
-install ffserver $RPM_BUILD_ROOT%{_sbindir}
-install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver
+install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
-%doc README Change* doc/{bench.txt,ffmpeg.txt,ffserver.txt,README*,TODO,FAQ}
+%doc Changelog README doc/*.html
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_sbindir}/*
-%attr(740,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
+%attr(755,root,root) %{_libdir}/libavcodec-*.so
+%attr(755,root,root) %{_libdir}/libavformat-*.so
+%dir %{_libdir}/vhook
+%attr(755,root,root) %{_libdir}/vhook/null.so
+%attr(755,root,root) %{_libdir}/vhook/fish.so
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
+
+%files vhook-imlib2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/vhook/imlib2.so
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavcodec.so
+%attr(755,root,root) %{_libdir}/libavformat.so
+%{_libdir}/lib*.la
+%{_includedir}/ffmpeg
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
projects / packages / ffmpeg.git / commitdiff