SOURCES (DEVEL): ffmpeg-libtool.patch - avoid using -L builddir

[qboosh]

Author: qboosh                       Date: Mon Oct 24 16:57:18 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- avoid using -L builddir

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

---- Diffs:

================================================================
Index: SOURCES/ffmpeg-libtool.patch
diff -u SOURCES/ffmpeg-libtool.patch:1.9.2.1 SOURCES/ffmpeg-libtool.patch:1.9.2.2
--- SOURCES/ffmpeg-libtool.patch:1.9.2.1	Thu Oct 13 17:30:49 2005
+++ SOURCES/ffmpeg-libtool.patch	Mon Oct 24 18:57:12 2005
@@ -79,8 +79,8 @@
  
  #
 --- 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 @@
++++ FFMpeg-20050806/libavcodec/Makefile	2005-10-24 08:23:46.219053520 +0200
+@@ -9,242 +9,242 @@
  # 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)
  
@@ -389,7 +389,8 @@
  endif
  endif
  
-@@ -238,13 +238,13 @@
+-EXTRALIBS += -L$(SRC_PATH)/libavutil -lavutil$(BUILDSUF)
++EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
  
  # currently using libdts for dts decoding
  ifeq ($(CONFIG_DTS),yes)
@@ -405,7 +406,7 @@
  ifeq ($(CONFIG_FAADBIN),yes)
  # no libs needed
  else
-@@ -253,17 +253,17 @@
+@@ -253,48 +253,49 @@
  endif
  
  ifeq ($(CONFIG_FAAC),yes)
@@ -426,8 +427,11 @@
  EXTRALIBS += -lx264
  endif
  
-@@ -272,29 +272,29 @@
- EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
+ ifeq ($(CONFIG_PP),yes)
+ ifeq ($(SHARED_PP),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
@@ -461,7 +465,7 @@
  EXTRALIBS += -lgsm
  endif
  
-@@ -305,30 +305,30 @@
+@@ -305,30 +306,30 @@
  
  # i386 mmx specific stuff
  ifeq ($(TARGET_MMX),yes)
@@ -502,7 +506,7 @@
  CFLAGS += $(MLIB_INC)
  endif
  
-@@ -340,82 +340,71 @@
+@@ -340,82 +341,71 @@
  
  # alpha specific stuff
  ifeq ($(TARGET_ARCH_ALPHA),yes)
@@ -579,9 +583,7 @@
 -	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
@@ -592,7 +594,9 @@
 -else
 -	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
 -endif
--
++$(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS)
++	libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(AMREXTRALIBS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
+ 
 -dsputil.o: dsputil.c dsputil.h
 +dsputil.lo: dsputil.c dsputil.h
  
@@ -612,7 +616,7 @@
  
  depend: $(SRCS)
  	$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -449,7 +441,7 @@
+@@ -449,7 +439,7 @@
  
  # api example program
  apiexample: apiexample.c $(LIB)
@@ -621,7 +625,7 @@
  
  # cpuid test
  cpuid_test: i386/cputest.c
-@@ -461,40 +453,38 @@
+@@ -461,40 +451,38 @@
  	$(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
  
  dct-test: dct-test.o fdctref.o $(LIB)
================================================================

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