SOURCES: avifile-system_wide_ffmpeg.patch (NEW), avifile-opt.patch...
pluto
pluto at pld-linux.org
Mon Mar 20 03:34:58 CET 2006
Author: pluto Date: Mon Mar 20 02:34:58 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use system-wide ffmpeg.
---- Files affected:
SOURCES:
avifile-system_wide_ffmpeg.patch (NONE -> 1.1) (NEW), avifile-opt.patch (1.10 -> 1.11) , avifile-sparc.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/avifile-system_wide_ffmpeg.patch
diff -u /dev/null SOURCES/avifile-system_wide_ffmpeg.patch:1.1
--- /dev/null Mon Mar 20 03:34:58 2006
+++ SOURCES/avifile-system_wide_ffmpeg.patch Mon Mar 20 03:34:53 2006
@@ -0,0 +1,202 @@
+
+ Makefile.am | 2 +-
+ configure.in | 19 -------------------
+ lib/Makefile.am | 4 +---
+ lib/Makefile.in | 4 +---
+ lib/aviread/Makefile.am | 15 ++++-----------
+ lib/aviread/Makefile.in | 17 +++++------------
+ plugins/Makefile.am | 2 +-
+ plugins/Makefile.in | 2 +-
+ plugins/libffmpeg/Makefile.am | 5 +----
+ plugins/libffmpeg/Makefile.in | 5 +----
+ plugins/libffmpeg/fillplugins.h | 1 -
+ 11 files changed, 16 insertions(+), 60 deletions(-)
+
+--- avifile-0.7-0.7.45/Makefile.am 2006-03-20 03:22:48.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/Makefile.am 2006-03-20 03:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = m4 ffmpeg drivers lib plugins bin \
++SUBDIRS = m4 drivers lib plugins bin \
+ doc include debian libavqt player samples
+
+ EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
+--- avifile-0.7-0.7.45/configure.in 2006-03-20 03:00:38.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/configure.in 2006-03-20 02:55:30.000000000 +0100
+@@ -800,11 +800,6 @@
+ fi
+
+
+-dnl =======================
+-dnl Configure ffmpeg plugin
+-dnl =======================
+-AM_PATH_FFMPEG
+-
+ dnl use_nasm=
+ dnl not needed right now
+ dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
+@@ -1014,20 +1009,6 @@
+
+ AC_OUTPUT(
+ Makefile
+- ffmpeg/Makefile
+- ffmpeg/libavformat/Makefile
+- ffmpeg/libavcodec/Makefile
+- ffmpeg/libavcodec/alpha/Makefile
+- ffmpeg/libavcodec/armv4l/Makefile
+- ffmpeg/libavcodec/i386/Makefile
+- ffmpeg/libavcodec/liba52/Makefile
+- ffmpeg/libavcodec/libpostproc/Makefile
+- ffmpeg/libavcodec/mlib/Makefile
+- ffmpeg/libavcodec/ppc/Makefile
+- ffmpeg/libavcodec/ps2/Makefile
+- ffmpeg/libavcodec/sh4/Makefile
+- ffmpeg/libavcodec/sparc/Makefile
+- ffmpeg/libavutil/Makefile
+ drivers/Makefile
+ drivers/libdha/Makefile
+ drivers/libdha/bin/Makefile
+--- avifile-0.7-0.7.45/lib/aviread/Makefile.am 2005-08-28 23:46:49.000000000 +0200
++++ avifile-0.7-0.7.45.fixed/lib/aviread/Makefile.am 2006-03-20 02:48:38.000000000 +0100
+@@ -45,22 +45,15 @@
+
+ if AMM_LINK_SHARED
+ FF_LIB = \
+- ../../ffmpeg/libavformat/libaviplayavformat.la \
+- ../../ffmpeg/libavcodec/libaviplayavcodec.la \
+- ../../ffmpeg/libavutil/libaviplayavutil.la
+-else
+-FF_LIB = \
+- ../../ffmpeg/libavformat/libavformat.la \
+- ../../ffmpeg/libavcodec/libavcodec.la \
+- ../../ffmpeg/libavutil/libavutil.la
++ $(libdir)/libavformat.la \
++ $(libdir)/libavcodec.la \
++ $(libdir)/libavutil.la
+ endif
+
+ libaviread_la_LIBADD = $(FF_LIB)
+
+ AM_CPPFLAGS = $(LTNOPIC) \
+ -I$(srcdir)/../common \
+- -I$(srcdir)/../../ffmpeg/libavformat \
+- -I$(srcdir)/../../ffmpeg/libavcodec \
+- -I$(srcdir)/../../ffmpeg/libavutil
++ -I/usr/include/ffmpeg
+
+ MAINTAINERCLEANFILES = Makefile.in
+--- avifile-0.7-0.7.45/lib/aviread/Makefile.in 2006-03-06 10:11:38.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/lib/aviread/Makefile.in 2006-03-20 02:56:58.000000000 +0100
+@@ -363,22 +370,15 @@
+ ReadStreamV.cpp \
+ StreamInfo.cpp
+
+- at AMM_LINK_SHARED_FALSE@FF_LIB = \
+- at AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavformat/libavformat.la \
+- at AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavcodec/libavcodec.la \
+- at AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavutil/libavutil.la
+-
+- at AMM_LINK_SHARED_TRUE@FF_LIB = \
+- at AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavformat/libaviplayavformat.la \
+- at AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavcodec/libaviplayavcodec.la \
+- at AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavutil/libaviplayavutil.la
++FF_LIB = \
++ $(libdir)/libavformat.la \
++ $(libdir)/libavcodec.la \
++ $(libdir)/libavutil.la
+
+ libaviread_la_LIBADD = $(FF_LIB)
+ AM_CPPFLAGS = $(LTNOPIC) \
+ -I$(srcdir)/../common \
+- -I$(srcdir)/../../ffmpeg/libavformat \
+- -I$(srcdir)/../../ffmpeg/libavcodec \
+- -I$(srcdir)/../../ffmpeg/libavutil
++ -I/usr/include/ffmpeg
+
+ MAINTAINERCLEANFILES = Makefile.in
+ all: all-am
+--- avifile-0.7-0.7.45/lib/Makefile.am 2005-08-28 23:39:25.000000000 +0200
++++ avifile-0.7-0.7.45.fixed/lib/Makefile.am 2006-03-20 02:52:26.000000000 +0100
+@@ -2,9 +2,7 @@
+ noinst_HEADERS = Uncompressed.h
+
+ COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
+- -I$(srcdir)/../ffmpeg/libavcodec \
+- -I$(srcdir)/../ffmpeg/libavformat \
+- -I$(srcdir)/../ffmpeg/libavutil
++ -I/usr/include/ffmpeg
+ if AMM_USE_FAST_BUILD
+ AVISOURCES = libaviplay.cpp
+ AVILIBADD =
+--- avifile-0.7-0.7.45/lib/Makefile.in 2006-03-06 10:11:38.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/lib/Makefile.in 2006-03-20 02:56:57.000000000 +0100
+@@ -338,9 +349,7 @@
+ DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
+ noinst_HEADERS = Uncompressed.h
+ COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
+- -I$(srcdir)/../ffmpeg/libavcodec \
+- -I$(srcdir)/../ffmpeg/libavformat \
+- -I$(srcdir)/../ffmpeg/libavutil
++ -I/usr/include/ffmpeg
+
+ @AMM_USE_FAST_BUILD_FALSE at AVISOURCES = codeckeeper.cpp Uncompressed.cpp
+ @AMM_USE_FAST_BUILD_TRUE at AVISOURCES = libaviplay.cpp
+--- avifile-0.7-0.7.45/plugins/libffmpeg/fillplugins.h 2006-03-06 09:47:18.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/fillplugins.h 2006-03-20 02:51:15.000000000 +0100
+@@ -10,7 +10,6 @@
+ #define uint64_t_C(c) (c ## ULL)
+ #endif
+ #include "avformat.h"
+-#include "opt.h"
+
+ #include <string.h>
+ #include <stdlib.h>
+--- avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.am 2005-08-28 23:40:12.000000000 +0200
++++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/Makefile.am 2006-03-20 02:50:57.000000000 +0100
+@@ -18,10 +18,7 @@
+ #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
+ #INSTRUMENT = -finstrument-functions
+ AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
+- -I$(srcdir)/../../ffmpeg/libavcodec \
+- -I$(srcdir)/../../ffmpeg/libavformat \
+- -I$(srcdir)/../../ffmpeg/libavutil \
+- -I$(srcdir)/../../ffmpeg
++ -I/usr/include/ffmpeg
+ AM_CXXFLAGS = $(CXXRTTIEXCEPT)
+
+ TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
+--- avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.in 2006-03-06 10:11:41.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/Makefile.in 2006-03-20 02:57:00.000000000 +0100
+@@ -338,10 +349,7 @@
+ #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
+ #INSTRUMENT = -finstrument-functions
+ AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
+- -I$(srcdir)/../../ffmpeg/libavcodec \
+- -I$(srcdir)/../../ffmpeg/libavformat \
+- -I$(srcdir)/../../ffmpeg/libavutil \
+- -I$(srcdir)/../../ffmpeg
++ -I/usr/include/ffmpeg
+
+ AM_CXXFLAGS = $(CXXRTTIEXCEPT)
+ TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
+--- avifile-0.7-0.7.45/plugins/Makefile.am 2004-02-09 10:43:30.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/plugins/Makefile.am 2006-03-20 02:50:18.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
+ -Ilibwin32/videocodec -Ilibwin32/loader \
+- -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
++ -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
+ -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
+ -Ddbg_printf=__vprintf -DTRACE=__vprintf \
+ -Wmissing-prototypes -Wimplicit-function-declaration \
+--- avifile-0.7-0.7.45/plugins/Makefile.in 2006-03-06 10:11:40.000000000 +0100
++++ avifile-0.7-0.7.45.fixed/plugins/Makefile.in 2006-03-20 02:57:00.000000000 +0100
+@@ -318,7 +329,7 @@
+ #libplugins_la_SOURCES = libplugins.cpp plugins.c
+ AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
+ -Ilibwin32/videocodec -Ilibwin32/loader \
+- -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
++ -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
+ -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
+ -Ddbg_printf=__vprintf -DTRACE=__vprintf \
+ -Wmissing-prototypes -Wimplicit-function-declaration \
================================================================
Index: SOURCES/avifile-opt.patch
diff -u SOURCES/avifile-opt.patch:1.10 SOURCES/avifile-opt.patch:1.11
--- SOURCES/avifile-opt.patch:1.10 Thu Mar 9 08:02:40 2006
+++ SOURCES/avifile-opt.patch Mon Mar 20 03:34:53 2006
@@ -1,14 +1,3 @@
---- avifile-0.7-0.7.45/ffmpeg/libavcodec/libpostproc/Makefile.am.orig 2005-08-28 23:03:13.000000000 +0200
-+++ avifile-0.7-0.7.45/ffmpeg/libavcodec/libpostproc/Makefile.am 2006-03-08 23:48:23.602890750 +0100
-@@ -11,8 +11,6 @@
- libpostproc_la_SOURCES = postprocess.c
-
- AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/../libavutil -I$(srcdir)/..
--AM_CFLAGS = -O2 -fomit-frame-pointer
--#-mno-omit-leaf-frame-pointer
-
- CLEANFILES = .depend *.a
- MAINTAINERCLEANFILES = Makefile.in
--- avifile-0.7-0.7.38/configure.in.orig 2003-12-29 23:38:53.000000000 +0100
+++ avifile-0.7-0.7.38/configure.in 2003-12-30 00:01:05.767775944 +0100
@@ -898,10 +898,6 @@
================================================================
Index: SOURCES/avifile-sparc.patch
diff -u SOURCES/avifile-sparc.patch:1.2 SOURCES/avifile-sparc.patch:1.3
--- SOURCES/avifile-sparc.patch:1.2 Wed Jan 4 08:24:46 2006
+++ SOURCES/avifile-sparc.patch Mon Mar 20 03:34:53 2006
@@ -8,12 +8,3 @@
;;
mips*)
AC_DEFINE(ARCH_MIPS, 1, [Define if you want to build on mips architecture.])
---- avifile-0.7-0.7.43/ffmpeg/libavcodec/sparc/Makefile.am.orig 2004-10-20 11:31:29.000000000 +0000
-+++ avifile-0.7-0.7.43/ffmpeg/libavcodec/sparc/Makefile.am 2006-01-04 06:50:49.846260882 +0000
-@@ -13,5 +13,6 @@
- endif
-
- AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H -I$(srcdir)/../..
-+AM_CFLAGS = -mcpu=ultrasparc
-
- MAINTAINERCLEANFILES = Makefile.in
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/avifile-opt.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SOURCES/avifile-sparc.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list