avifile-system_wide_ffmpeg.patch

   1
   2  Makefile.am                     |    2 +-
   3  configure.in                    |   19 -------------------
   4  lib/Makefile.am                 |    4 +---
   5  lib/Makefile.in                 |    4 +---
   6  lib/aviread/Makefile.am         |   15 ++++-----------
   7  lib/aviread/Makefile.in         |   17 +++++------------
   8  plugins/Makefile.am             |    2 +-
   9  plugins/Makefile.in             |    2 +-
  10  plugins/libffmpeg/Makefile.am   |    5 +----
  11  plugins/libffmpeg/Makefile.in   |    5 +----
  12  plugins/libffmpeg/fillplugins.h |    1 -
  13  11 files changed, 16 insertions(+), 60 deletions(-)
  14
  15 --- avifile-0.7-0.7.45/Makefile.am      2006-03-20 03:22:48.000000000 +0100
  16 +++ avifile-0.7-0.7.45.fixed/Makefile.am        2006-03-20 03:26:29.000000000 +0100
  17 @@ -1,4 +1,4 @@
  18 -SUBDIRS = m4 ffmpeg drivers lib plugins bin \
  19 +SUBDIRS = m4 drivers lib plugins bin \
  20   doc include debian libavqt player samples
  21
  22  EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
  23 --- avifile-0.7-0.7.45/configure.in     2006-03-20 03:00:38.000000000 +0100
  24 +++ avifile-0.7-0.7.45.fixed/configure.in       2006-03-20 02:55:30.000000000 +0100
  25 @@ -800,11 +800,6 @@
  26  fi
  27
  28
  29 -dnl =======================
  30 -dnl Configure ffmpeg plugin
  31 -dnl =======================
  32 -AM_PATH_FFMPEG
  33 -
  34  dnl use_nasm=
  35  dnl  not needed right now
  36  dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
  37 @@ -1014,20 +1009,6 @@
  38
  39  AC_OUTPUT(
  40   Makefile
  41 - ffmpeg/Makefile
  42 - ffmpeg/libavformat/Makefile
  43 - ffmpeg/libavcodec/Makefile
  44 - ffmpeg/libavcodec/alpha/Makefile
  45 - ffmpeg/libavcodec/armv4l/Makefile
  46 - ffmpeg/libavcodec/i386/Makefile
  47 - ffmpeg/libavcodec/liba52/Makefile
  48 - ffmpeg/libavcodec/libpostproc/Makefile
  49 - ffmpeg/libavcodec/mlib/Makefile
  50 - ffmpeg/libavcodec/ppc/Makefile
  51 - ffmpeg/libavcodec/ps2/Makefile
  52 - ffmpeg/libavcodec/sh4/Makefile
  53 - ffmpeg/libavcodec/sparc/Makefile
  54 - ffmpeg/libavutil/Makefile
  55   drivers/Makefile
  56   drivers/libdha/Makefile
  57   drivers/libdha/bin/Makefile
  58 --- avifile-0.7-0.7.45/lib/aviread/Makefile.am  2005-08-28 23:46:49.000000000 +0200
  59 +++ avifile-0.7-0.7.45.fixed/lib/aviread/Makefile.am    2006-03-20 02:48:38.000000000 +0100
  60 @@ -45,22 +45,15 @@
  61
  62  if AMM_LINK_SHARED
  63  FF_LIB = \
  64 - ../../ffmpeg/libavformat/libaviplayavformat.la \
  65 - ../../ffmpeg/libavcodec/libaviplayavcodec.la \
  66 - ../../ffmpeg/libavutil/libaviplayavutil.la
  67 -else
  68 -FF_LIB = \
  69 - ../../ffmpeg/libavformat/libavformat.la \
  70 - ../../ffmpeg/libavcodec/libavcodec.la \
  71 - ../../ffmpeg/libavutil/libavutil.la
  72 + $(libdir)/libavformat.la \
  73 + $(libdir)/libavcodec.la \
  74 + $(libdir)/libavutil.la
  75  endif
  76
  77  libaviread_la_LIBADD = $(FF_LIB)
  78
  79  AM_CPPFLAGS = $(LTNOPIC) \
  80   -I$(srcdir)/../common \
  81 - -I$(srcdir)/../../ffmpeg/libavformat \
  82 - -I$(srcdir)/../../ffmpeg/libavcodec \
  83 - -I$(srcdir)/../../ffmpeg/libavutil
  84 + -I/usr/include/ffmpeg
  85
  86  MAINTAINERCLEANFILES = Makefile.in
  87 --- avifile-0.7-0.7.45/lib/aviread/Makefile.in  2006-03-06 10:11:38.000000000 +0100
  88 +++ avifile-0.7-0.7.45.fixed/lib/aviread/Makefile.in    2006-03-20 02:56:58.000000000 +0100
  89 @@ -363,22 +370,15 @@
  90   ReadStreamV.cpp \
  91   StreamInfo.cpp
  92
  93 -@AMM_LINK_SHARED_FALSE@FF_LIB = \
  94 -@AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavformat/libavformat.la \
  95 -@AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavcodec/libavcodec.la \
  96 -@AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavutil/libavutil.la
  97 -
  98 -@AMM_LINK_SHARED_TRUE@FF_LIB = \
  99 -@AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavformat/libaviplayavformat.la \
 100 -@AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavcodec/libaviplayavcodec.la \
 101 -@AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavutil/libaviplayavutil.la
 102 +FF_LIB = \
 103 + $(libdir)/libavformat.la \
 104 + $(libdir)/libavcodec.la \
 105 + $(libdir)/libavutil.la
 106
 107  libaviread_la_LIBADD = $(FF_LIB)
 108  AM_CPPFLAGS = $(LTNOPIC) \
 109   -I$(srcdir)/../common \
 110 - -I$(srcdir)/../../ffmpeg/libavformat \
 111 - -I$(srcdir)/../../ffmpeg/libavcodec \
 112 - -I$(srcdir)/../../ffmpeg/libavutil
 113 + -I/usr/include/ffmpeg
 114
 115  MAINTAINERCLEANFILES = Makefile.in
 116  all: all-am
 117 --- avifile-0.7-0.7.45/lib/Makefile.am  2005-08-28 23:39:25.000000000 +0200
 118 +++ avifile-0.7-0.7.45.fixed/lib/Makefile.am    2006-03-20 02:52:26.000000000 +0100
 119 @@ -2,9 +2,7 @@
 120  noinst_HEADERS = Uncompressed.h
 121
 122  COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
 123 - -I$(srcdir)/../ffmpeg/libavcodec \
 124 - -I$(srcdir)/../ffmpeg/libavformat \
 125 - -I$(srcdir)/../ffmpeg/libavutil
 126 + -I/usr/include/ffmpeg
 127  if AMM_USE_FAST_BUILD
 128  AVISOURCES = libaviplay.cpp
 129  AVILIBADD =
 130 --- avifile-0.7-0.7.45/lib/Makefile.in  2006-03-06 10:11:38.000000000 +0100
 131 +++ avifile-0.7-0.7.45.fixed/lib/Makefile.in    2006-03-20 02:56:57.000000000 +0100
 132 @@ -338,9 +349,7 @@
 133  DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
 134  noinst_HEADERS = Uncompressed.h
 135  COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
 136 - -I$(srcdir)/../ffmpeg/libavcodec \
 137 - -I$(srcdir)/../ffmpeg/libavformat \
 138 - -I$(srcdir)/../ffmpeg/libavutil
 139 + -I/usr/include/ffmpeg
 140
 141  @AMM_USE_FAST_BUILD_FALSE@AVISOURCES = codeckeeper.cpp Uncompressed.cpp
 142  @AMM_USE_FAST_BUILD_TRUE@AVISOURCES = libaviplay.cpp
 143 --- avifile-0.7-0.7.45/plugins/libffmpeg/fillplugins.h  2006-03-06 09:47:18.000000000 +0100
 144 +++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/fillplugins.h    2006-03-20 02:51:15.000000000 +0100
 145 @@ -10,7 +10,6 @@
 146  #define uint64_t_C(c)    (c ## ULL)
 147  #endif
 148  #include "avformat.h"
 149 -#include "opt.h"
 150
 151  #include <string.h>
 152  #include <stdlib.h>
 153 --- avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.am    2005-08-28 23:40:12.000000000 +0200
 154 +++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/Makefile.am      2006-03-20 02:50:57.000000000 +0100
 155 @@ -18,10 +18,7 @@
 156  #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
 157  #INSTRUMENT = -finstrument-functions
 158  AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
 159 - -I$(srcdir)/../../ffmpeg/libavcodec \
 160 - -I$(srcdir)/../../ffmpeg/libavformat \
 161 - -I$(srcdir)/../../ffmpeg/libavutil \
 162 - -I$(srcdir)/../../ffmpeg
 163 + -I/usr/include/ffmpeg
 164  AM_CXXFLAGS = $(CXXRTTIEXCEPT)
 165
 166  TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
 167 --- avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.in    2006-03-06 10:11:41.000000000 +0100
 168 +++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/Makefile.in      2006-03-20 02:57:00.000000000 +0100
 169 @@ -338,10 +349,7 @@
 170  #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
 171  #INSTRUMENT = -finstrument-functions
 172  AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
 173 - -I$(srcdir)/../../ffmpeg/libavcodec \
 174 - -I$(srcdir)/../../ffmpeg/libavformat \
 175 - -I$(srcdir)/../../ffmpeg/libavutil \
 176 - -I$(srcdir)/../../ffmpeg
 177 + -I/usr/include/ffmpeg
 178
 179  AM_CXXFLAGS = $(CXXRTTIEXCEPT)
 180  TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
 181 --- avifile-0.7-0.7.45/plugins/Makefile.am      2004-02-09 10:43:30.000000000 +0100
 182 +++ avifile-0.7-0.7.45.fixed/plugins/Makefile.am        2006-03-20 02:50:18.000000000 +0100
 183 @@ -20,7 +20,7 @@
 184
 185  AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
 186   -Ilibwin32/videocodec -Ilibwin32/loader \
 187 - -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
 188 + -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
 189   -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
 190   -Ddbg_printf=__vprintf -DTRACE=__vprintf \
 191   -Wmissing-prototypes -Wimplicit-function-declaration \
 192 --- avifile-0.7-0.7.45/plugins/Makefile.in      2006-03-06 10:11:40.000000000 +0100
 193 +++ avifile-0.7-0.7.45.fixed/plugins/Makefile.in        2006-03-20 02:57:00.000000000 +0100
 194 @@ -318,7 +329,7 @@
 195  #libplugins_la_SOURCES = libplugins.cpp plugins.c
 196  AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
 197   -Ilibwin32/videocodec -Ilibwin32/loader \
 198 - -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
 199 + -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
 200   -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
 201   -Ddbg_printf=__vprintf -DTRACE=__vprintf \
 202   -Wmissing-prototypes -Wimplicit-function-declaration \