package/multimedia/avifile/system-ffmpeg.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../avifile/system-ffmpeg.patch
   5 # Copyright (C) 2004 - 2006 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 diff -ur avifile-0.6/lib/Makefile.am avifile-0.6-fixed/lib/Makefile.am
  17 --- avifile-0.6/lib/Makefile.am 2000-01-01 00:00:00.000000000 +0100
  18 +++ avifile-0.6-fixed/lib/Makefile.am   2005-10-26 12:07:58.000000000 +0200
  19 @@ -2,9 +2,9 @@
  20  noinst_HEADERS = Uncompressed.h
  21
  22  COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
  23 - -I$(srcdir)/../ffmpeg/libavcodec \
  24 - -I$(srcdir)/../ffmpeg/libavformat \
  25 - -I$(srcdir)/../ffmpeg/libavutil
  26 + -I/usr/include/ffmpeg \
  27 + -I/usr/include/ffmpeg \
  28 + -I/usr/include/ffmpeg
  29  if AMM_USE_FAST_BUILD
  30  AVISOURCES = libaviplay.cpp
  31  AVILIBADD =
  32 diff -ur avifile-0.6/plugins/Makefile.am avifile-0.6-fixed/plugins/Makefile.am
  33 --- avifile-0.6/plugins/Makefile.am     2000-01-01 00:00:00.000000000 +0100
  34 +++ avifile-0.6-fixed/plugins/Makefile.am       2005-10-26 12:07:58.000000000 +0200
  35 @@ -20,7 +20,7 @@
  36
  37  AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
  38   -Ilibwin32/videocodec -Ilibwin32/loader \
  39 - -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
  40 + -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
  41   -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
  42   -Ddbg_printf=__vprintf -DTRACE=__vprintf \
  43   -Wmissing-prototypes -Wimplicit-function-declaration \
  44 diff -ur avifile-0.6/plugins/libffmpeg/Makefile.am avifile-0.6-fixed/plugins/libffmpeg/Makefile.am
  45 --- avifile-0.6/plugins/libffmpeg/Makefile.am   2000-01-01 00:00:00.000000000 +0100
  46 +++ avifile-0.6-fixed/plugins/libffmpeg/Makefile.am     2005-10-26 12:07:58.000000000 +0200
  47 @@ -18,10 +18,10 @@
  48  #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
  49  #INSTRUMENT = -finstrument-functions
  50  AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
  51 - -I$(srcdir)/../../ffmpeg/libavcodec \
  52 - -I$(srcdir)/../../ffmpeg/libavformat \
  53 - -I$(srcdir)/../../ffmpeg/libavutil \
  54 - -I$(srcdir)/../../ffmpeg
  55 + -I/usr/include/ffmpeg \
  56 + -I/usr/include/ffmpeg \
  57 + -I/usr/include/ffmpeg \
  58 + -I/usr/include/ffmpeg
  59  AM_CXXFLAGS = $(CXXRTTIEXCEPT)
  60
  61  TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
  62 --- ./lib/aviread/Makefile.am~  2000-01-01 00:00:00.000000000 +0100
  63 +++ ./lib/aviread/Makefile.am   2006-11-29 18:20:03.000000000 +0100
  64 @@ -43,26 +43,14 @@
  65   StreamInfo.cpp
  66
  67
  68 -if AMM_LINK_SHARED
  69 -FF_LIB = \
  70 - ../../ffmpeg/libavformat/libaviplayavformat.la \
  71 - ../../ffmpeg/libavcodec/libaviplayavcodec.la \
  72 - ../../ffmpeg/libswscale/libaviplayswscale.la \
  73 - ../../ffmpeg/libavutil/libaviplayavutil.la
  74 -else
  75 -FF_LIB = \
  76 - ../../ffmpeg/libavformat/libavformat.la \
  77 - ../../ffmpeg/libavcodec/libavcodec.la \
  78 - ../../ffmpeg/libswscale/libswscale.la \
  79 - ../../ffmpeg/libavutil/libavutil.la
  80 -endif
  81 +FF_LIB =
  82
  83  libaviread_la_LIBADD = $(FF_LIB)
  84
  85  AM_CPPFLAGS = $(LTNOPIC) \
  86   -I$(srcdir)/../common \
  87 - -I$(srcdir)/../../ffmpeg/libavformat \
  88 - -I$(srcdir)/../../ffmpeg/libavcodec \
  89 - -I$(srcdir)/../../ffmpeg/libavutil
  90 + -I/usr/include/ffmpeg \
  91 + -I/usr/include/ffmpeg \
  92 + -I/usr/include/ffmpeg
  93
  94  MAINTAINERCLEANFILES = Makefile.in
  95 --- ./Makefile.am~      2000-01-01 00:00:00.000000000 +0100
  96 +++ ./Makefile.am       2006-11-29 18:17:52.000000000 +0100
  97 @@ -1,4 +1,4 @@
  98 -SUBDIRS = . admin m4 include ffmpeg drivers lib plugins bin \
  99 +SUBDIRS = . admin m4 include drivers lib plugins bin \
 100   doc debian libavqt player samples
 101
 102  EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
 103 --- ./configure.in~     2006-11-29 18:14:26.000000000 +0100
 104 +++ ./configure.in      2006-11-29 18:18:37.000000000 +0100
 105 @@ -1004,21 +1004,6 @@
 106  AC_CONFIG_FILES([
 107   Makefile
 108   admin/Makefile
 109 - ffmpeg/Makefile
 110 - ffmpeg/libavformat/Makefile
 111 - ffmpeg/libavcodec/Makefile
 112 - ffmpeg/libavcodec/alpha/Makefile
 113 - ffmpeg/libavcodec/armv4l/Makefile
 114 - ffmpeg/libavcodec/i386/Makefile
 115 - ffmpeg/libavcodec/liba52/Makefile
 116 - ffmpeg/libavcodec/mlib/Makefile
 117 - ffmpeg/libavcodec/ppc/Makefile
 118 - ffmpeg/libavcodec/ps2/Makefile
 119 - ffmpeg/libavcodec/sh4/Makefile
 120 - ffmpeg/libavcodec/sparc/Makefile
 121 - ffmpeg/libavutil/Makefile
 122 - ffmpeg/libpostproc/Makefile
 123 - ffmpeg/libswscale/Makefile
 124   drivers/Makefile
 125   drivers/libdha/Makefile
 126   drivers/libdha/bin/Makefile