File use-ffmpeg-libs.patch of Package libav
From: Antonio Larrosa <alarrosa@suse.com>
Subject: Change the build scripts to build libav with ffmpeg libraries
Change the Makefile and configure script to not build the libav*/libswscaler
libraries, and use the ones from ffmpeg instead.
Index: libav-12.3/Makefile
===================================================================
--- libav-12.3.orig/Makefile
+++ libav-12.3/Makefile
@@ -23,7 +23,7 @@ endif
ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil swscale
-IFLAGS := -I. -I$(SRC_PATH)
+IFLAGS := -I. -I$(SRC_PATH) $(IFLAGS)
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
@@ -85,7 +85,8 @@ OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
-TOOLS = qt-faststart trasher
+TOOLS = aviocat ismindex pktdumper probetest sidxindex graph2dot \
+ qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
# $(FFLIBS-yes) needs to be in linking order
@@ -112,7 +113,7 @@ FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
all: $(AVPROGS)
$(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
- $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
+ $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS)
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
@@ -142,7 +143,7 @@ include $(SRC_PATH)/$(1)/Makefile
include $(SRC_PATH)/library.mak
endef
-$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
+#$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
include $(SRC_PATH)/doc/Makefile
@@ -157,7 +158,7 @@ endef
$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
-$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
+$(PROGS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
OBJDIRS += tools
@@ -181,12 +182,12 @@ ifdef AVPROGS
install: install-progs install-data
endif
-install: install-libs install-headers
+install:
install-libs: install-libs-yes
install-progs-yes:
-install-progs-$(CONFIG_SHARED): install-libs
+install-progs-$(CONFIG_SHARED):
install-progs: install-progs-yes $(AVPROGS)
$(Q)mkdir -p "$(BINDIR)"
Index: libav-12.3/configure
===================================================================
--- libav-12.3.orig/configure
+++ libav-12.3/configure
@@ -1548,11 +1548,16 @@ INTRINSICS_LIST="
MATH_FUNCS="
atanf
atan2f
+ cbrt
cbrtf
+ copysign
cosf
+ erf
exp2
exp2f
expf
+ hypot
+ isfinite
isinf
isnan
ldexpf
@@ -4594,6 +4599,8 @@ check_lib math.h sin -lm && LIBM="-lm"
enabled vaapi && require vaapi va/va.h vaInitialize -lva
atan2f_args=2
+copysign_args=2
+hypot_args=2
ldexpf_args=2
powf_args=2