From f87132030c335eecb30aff7893c4157a2f12831f Mon Sep 17 00:00:00 2001 From: Minto van der Sluis Date: Thu, 20 Sep 2007 21:46:51 +0200 Subject: [PATCH] Updated avifile (0-7-050913 -> 0-7-070918) - Redone all the patches --- multimedia/avifile/avifile.conf | 4 + multimedia/avifile/avifile.desc | 4 +- multimedia/avifile/gcc41.patch | 113 ----------------- multimedia/avifile/glibc-2.3.4.patch | 32 ----- multimedia/avifile/head-n1-usage.patch | 79 ++++++++---- multimedia/avifile/signedness.patch | 24 ++++ multimedia/avifile/system-ffmpeg.patch | 147 +++++++++------------- multimedia/avifile/xvid4-needs-libm.patch | 36 ++---- 8 files changed, 155 insertions(+), 284 deletions(-) delete mode 100644 multimedia/avifile/gcc41.patch delete mode 100644 multimedia/avifile/glibc-2.3.4.patch create mode 100644 multimedia/avifile/signedness.patch diff --git a/multimedia/avifile/avifile.conf b/multimedia/avifile/avifile.conf index 0b7824bac..b56424956 100644 --- a/multimedia/avifile/avifile.conf +++ b/multimedia/avifile/avifile.conf @@ -14,6 +14,10 @@ autogen=1 +# Prevent using the internal ffmpeg and use an external one instead. +pkgprefix -t ffmpeg +var_append GCC_WRAPPER_APPEND ' ' "-I$root/$(pkgprefix includedir ffmpeg)/ffmpeg" + # some addition to the patches to use the system ffmpeg var_append makeopt ' ' 'FF_LIB="-lavformat -lavcodec -lavutil"' # just to be sure diff --git a/multimedia/avifile/avifile.desc b/multimedia/avifile/avifile.desc index 33ab9ba80..e49b6fe80 100644 --- a/multimedia/avifile/avifile.desc +++ b/multimedia/avifile/avifile.desc @@ -33,8 +33,8 @@ [L] GPL [S] Beta -[V] 0-7-050913 +[V] 0-7-070918 [P] X -----5---9 159.100 #[D] 3121285125 avifile-0.7-0.7.43.tar.bz2 http://dl.sourceforge.net/sourceforge/avifile/ -[D] X avifile-0.7-050913.tar.bz2 cvs://:pserver:anonymous@cvs.sourceforge.net:/cvsroot/avifile/ avifile-0.6 -D 2005-09-13 +[D] X avifile-0.7-070918.tar.bz2 cvs://:pserver:anonymous@avifile.cvs.sourceforge.net:/cvsroot/avifile/ avifile-0.6 -D 2007-09-18 diff --git a/multimedia/avifile/gcc41.patch b/multimedia/avifile/gcc41.patch deleted file mode 100644 index 25100452d..000000000 --- a/multimedia/avifile/gcc41.patch +++ /dev/null @@ -1,113 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../avifile/gcc41.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - ---- avifile-0.6/lib/aviplay/aviplay_impl.h.vanilla 2006-03-04 23:36:51.209437000 +0100 -+++ avifile-0.6/lib/aviplay/aviplay_impl.h 2006-03-04 23:36:58.897917500 +0100 -@@ -136,7 +136,7 @@ - void createAudioRenderer(); - int restartVideoStreaming(const char* codec = 0); - -- mutable int AviPlayer::propertyRead[LAST_PROPERTY]; // have we read at least once from Registry:: -+ mutable int propertyRead[LAST_PROPERTY]; // have we read at least once from Registry:: - - avm::vector m_VideoRenderers; // we could draw image to more places - IAudioRenderer* m_pAudioRenderer; // not sure about the sound - this will be ---- avifile-0.6/plugins/libaudiodec/audiodecoder.cpp.vanilla 2006-03-04 23:39:15.462452250 +0100 -+++ avifile-0.6/plugins/libaudiodec/audiodecoder.cpp 2006-03-04 23:39:23.302942250 +0100 -@@ -114,7 +114,7 @@ - class MSGSM_Decoder : public IAudioDecoder - { - public: -- MSGSM_Decoder::MSGSM_Decoder(const CodecInfo& info, const WAVEFORMATEX* wf) -+ MSGSM_Decoder(const CodecInfo& info, const WAVEFORMATEX* wf) - :IAudioDecoder(info, wf) - { - GSM_Init(); ---- avifile-0.6/plugins/libmp3lame_audioenc/mp3encoder.cpp.vanilla 2006-03-04 23:46:09.756344000 +0100 -+++ avifile-0.6/plugins/libmp3lame_audioenc/mp3encoder.cpp 2006-03-04 23:46:24.041236750 +0100 -@@ -30,7 +30,7 @@ - short nCodecDelay; - }; - public: -- MP3Encoder::MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format) -+ MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format) - :IAudioEncoder(info) - { - in_fmt=*format; ---- avifile-0.6/plugins/libmp3lamebin_audioenc/lameencoder.cpp.vanilla 2006-03-04 23:44:06.212623000 +0100 -+++ avifile-0.6/plugins/libmp3lamebin_audioenc/lameencoder.cpp 2006-03-04 23:44:34.766407500 +0100 -@@ -71,14 +71,14 @@ - int CDECL (*p_lame_set_quality)(lame_global_flags *, int); - - public: -- LameEncoder::LameEncoder(const CodecInfo& info, const WAVEFORMATEX* format) -+ LameEncoder(const CodecInfo& info, const WAVEFORMATEX* format) - :IAudioEncoder(info), handle(0) - { - m_Error[0] = 0; - in_fmt = *format; - } - -- int LameEncoder::init() -+ int init() - { - handle = dlopen(mp3lamename, RTLD_LAZY); - ---- avifile-0.6/plugins/libmpeg_audiodec/mpegsound.h.vanilla 2006-03-04 23:47:10.168119500 +0100 -+++ avifile-0.6/plugins/libmpeg_audiodec/mpegsound.h 2006-03-04 23:47:39.009922000 +0100 -@@ -198,14 +198,14 @@ - void forward(int bits) {bitindex+=bits;}; - int getbits(int bits); - -- int Mpegbitwindow::getbit(void) -+ int getbit(void) - { - // register int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; - register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; - bitindex++; - return r; - } -- int Mpegbitwindow::getbits9(int bits) -+ int getbits9(int bits) - { - register unsigned short a; - -@@ -481,9 +481,9 @@ - #define MPEGNOINSTRUMENTFUNCTION - Mpegbitwindow bitwindow; - -- int Mpegtoraw::wgetbit(void) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbit(); } -- int Mpegtoraw::wgetbits9(int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits9(bits); } -- int Mpegtoraw::wgetbits (int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits (bits); } -+ int wgetbit(void) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbit(); } -+ int wgetbits9(int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits9(bits); } -+ int wgetbits (int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits (bits); } - - /*************************************/ - /* Decoding functions for each layer */ ---- avifile-0.6/samples/misc/avicat.cpp.vanilla 2006-03-04 23:48:28.180995000 +0100 -+++ avifile-0.6/samples/misc/avicat.cpp 2006-03-04 23:48:52.846536500 +0100 -@@ -140,8 +140,8 @@ - avm::IVideoEncoder *vidEnc; - void copyAudioFrames(int, int, bool); - void createVideoEncoder(fourcc_t); -- void AviCutter::writeVideoFrame(avm::CImage *image); -- void AviCutter::copyVideoFrame(); -+ void writeVideoFrame(avm::CImage *image); -+ void copyVideoFrame(); - - public: - AviCutter(avm::IWriteFile* outF, diff --git a/multimedia/avifile/glibc-2.3.4.patch b/multimedia/avifile/glibc-2.3.4.patch deleted file mode 100644 index 71c152a01..000000000 --- a/multimedia/avifile/glibc-2.3.4.patch +++ /dev/null @@ -1,32 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../avifile/glibc-2.3.4.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Some invalid assumptions that fail since glibc-2.3.4. - - - Rene Rebe - ---- ./include/utils.h.orig 2002-09-24 09:19:22.000000000 +0200 -+++ ./include/utils.h 2005-01-06 19:48:45.122345888 +0100 -@@ -4,6 +4,9 @@ - #include "avm_default.h" - #include "formats.h" - -+#undef __THROW -+#define __THROW -+ - /** - * Utility functions. - * plain C functions are here diff --git a/multimedia/avifile/head-n1-usage.patch b/multimedia/avifile/head-n1-usage.patch index 54d1f01c5..94df237f3 100644 --- a/multimedia/avifile/head-n1-usage.patch +++ b/multimedia/avifile/head-n1-usage.patch @@ -1,26 +1,53 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../avifile/head-n1-usage.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- ---- avifile-0.7-0.7.41/configure.in 2004-10-01 15:17:36.000000000 +0200 -+++ avifile-0.7-0.7.41-t2/configure.in 2004-10-21 22:24:04.066025928 +0200 -@@ -913,7 +913,7 @@ - WIN32_CFLAGS=`echo $CFLAGS | sed s/-fomit-frame-pointer//g` - AC_SUBST(WIN32_CFLAGS) - --lt_major_version=`libtool --version 2>&1 | head -1 | sed 's/\(.*\ \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\(.*\)/\2/'` -+lt_major_version=`libtool --version 2>&1 | head -n1 | sed 's/\(.*\ \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\(.*\)/\2/'` - lt_minor_version=`echo $lt_major_version | cut -d . -f 2` - lt_micro_version=`echo $lt_major_version | cut -d . -f 3` - lt_major_version=`echo $lt_major_version | cut -d . -f 1` +diff -ruN avifile-0.6.orig/autogen.sh avifile-0.6/autogen.sh +--- avifile-0.6.orig/autogen.sh 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/autogen.sh 2007-09-19 20:07:53.000000000 +0200 +@@ -196,9 +196,9 @@ + echo " automake 1.4 or better (automake 1.6.0 is buggy!)" + echo " autoconf 2.52 or better" + echo "Your installed version:" +- $use_libtool --version | head -1 +- $use_automake --version | head -1 +- $use_autoconf --version | head -1 ++ $use_libtool --version | head -n1 ++ $use_automake --version | head -n1 ++ $use_autoconf --version | head -n1 + echo "Report aclocal = " + $use_aclocal --print-ac-dir + echo "Please report your problem on kabi@users.sourceforge.net" +diff -ruN avifile-0.6.orig/config.guess avifile-0.6/config.guess +--- avifile-0.6.orig/config.guess 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/config.guess 2007-09-19 20:08:39.000000000 +0200 +@@ -197,7 +197,7 @@ + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + sun*:*:4.2BSD:*) +- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ UNAME_RELEASE=`(head -n1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) +@@ -376,7 +376,7 @@ + fi + exit 0 ;; + *:AIX:*:4) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n1 | awk '{ print $1 }'` + if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else +diff -ruN avifile-0.6.orig/libmmxnow/autogen.sh avifile-0.6/libmmxnow/autogen.sh +--- avifile-0.6.orig/libmmxnow/autogen.sh 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/libmmxnow/autogen.sh 2007-09-19 20:10:19.000000000 +0200 +@@ -176,9 +176,9 @@ + echo " automake 1.4 or better" + echo " autoconf 2.52 or better" + echo "Your installed version:" +- $use_libtool --version | head -1 +- $use_automake --version | head -1 +- $use_autoconf --version | head -1 ++ $use_libtool --version | head -n1 ++ $use_automake --version | head -n1 ++ $use_autoconf --version | head -n1 + echo "Report aclocal = " + $use_aclocal --print-ac-dir + echo "Please report your problem on avifile-admin@prak.org" diff --git a/multimedia/avifile/signedness.patch b/multimedia/avifile/signedness.patch new file mode 100644 index 000000000..de069e503 --- /dev/null +++ b/multimedia/avifile/signedness.patch @@ -0,0 +1,24 @@ +diff -ruN avifile-0.6.orig/samples/qtvidcap/kv4lsetup.cpp avifile-0.6/samples/qtvidcap/kv4lsetup.cpp +--- avifile-0.6.orig/samples/qtvidcap/kv4lsetup.cpp 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/samples/qtvidcap/kv4lsetup.cpp 2007-09-19 21:20:17.000000000 +0200 +@@ -233,7 +233,7 @@ + if (XF86DGAQueryExtension(dpy, &foo, &bar)) { + XF86DGAQueryDirectVideo(dpy, XDefaultScreen(dpy),&flags); + if (flags & XF86DGADirectPresent) { +- XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(int*)&base,&width,&foo,&bar); ++ XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(unsigned int*)&base,&width,&foo,&bar); + set_bpl = width * set_bpp/8; + set_base = base; + if (verbose == 2) { +diff -ruN avifile-0.6.orig/samples/qtvidcap/v4lxif.cpp avifile-0.6/samples/qtvidcap/v4lxif.cpp +--- avifile-0.6.orig/samples/qtvidcap/v4lxif.cpp 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/samples/qtvidcap/v4lxif.cpp 2007-09-19 21:30:53.000000000 +0200 +@@ -1140,7 +1140,7 @@ + major, minor, XDGA_MAJOR_VERSION, XDGA_MINOR_VERSION); + have_dga = false; + } else { +- XF86DGAGetVideoLL(disp, DefaultScreen(disp), (int*)&base, &width, &bank, &ram); ++ XF86DGAGetVideoLL(disp, DefaultScreen(disp), (unsigned int*)&base, &width, &bank, &ram); + if (!base) + AVMOUT(AVML_WARN, "Can not allocate frame buffer base!"); + } diff --git a/multimedia/avifile/system-ffmpeg.patch b/multimedia/avifile/system-ffmpeg.patch index a9f3f0cbb..49d1ca5f3 100644 --- a/multimedia/avifile/system-ffmpeg.patch +++ b/multimedia/avifile/system-ffmpeg.patch @@ -1,83 +1,22 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../avifile/system-ffmpeg.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- -diff -ur avifile-0.6/Makefile.am avifile-0.6-fixed/Makefile.am ---- avifile-0.6/Makefile.am 2000-01-01 00:00:00.000000000 +0100 -+++ avifile-0.6-fixed/Makefile.am 2005-10-26 11:28:21.000000000 +0200 +diff -ruN avifile-0.6.orig/Makefile.am avifile-0.6/Makefile.am +--- avifile-0.6.orig/Makefile.am 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/Makefile.am 2007-09-20 21:12:01.000000000 +0200 @@ -1,4 +1,4 @@ --SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin \ -+SUBDIRS = . admin m4 drivers lib plugins bin \ - doc include debian libavqt player samples +-SUBDIRS = . admin m4 include ffmpeg drivers lib plugins bin \ ++SUBDIRS = . admin m4 include drivers lib plugins bin \ + doc debian libavqt player samples EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \ -diff -ur avifile-0.6/lib/Makefile.am avifile-0.6-fixed/lib/Makefile.am ---- avifile-0.6/lib/Makefile.am 2000-01-01 00:00:00.000000000 +0100 -+++ avifile-0.6-fixed/lib/Makefile.am 2005-10-26 12:07:58.000000000 +0200 -@@ -2,9 +2,9 @@ - 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 \ -+ -I/usr/include/ffmpeg \ -+ -I/usr/include/ffmpeg - if AMM_USE_FAST_BUILD - AVISOURCES = libaviplay.cpp - AVILIBADD = -diff -ur avifile-0.6/plugins/Makefile.am avifile-0.6-fixed/plugins/Makefile.am ---- avifile-0.6/plugins/Makefile.am 2000-01-01 00:00:00.000000000 +0100 -+++ avifile-0.6-fixed/plugins/Makefile.am 2005-10-26 12:07:58.000000000 +0200 -@@ -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 \ -diff -ur avifile-0.6/plugins/libffmpeg/Makefile.am avifile-0.6-fixed/plugins/libffmpeg/Makefile.am ---- avifile-0.6/plugins/libffmpeg/Makefile.am 2000-01-01 00:00:00.000000000 +0100 -+++ avifile-0.6-fixed/plugins/libffmpeg/Makefile.am 2005-10-26 12:07:58.000000000 +0200 -@@ -18,10 +18,10 @@ - #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 \ -+ -I/usr/include/ffmpeg \ -+ -I/usr/include/ffmpeg \ -+ -I/usr/include/ffmpeg - AM_CXXFLAGS = $(CXXRTTIEXCEPT) - - TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS) ---- ./configure.in 2005-10-26 12:32:57.000000000 +0200 -+++ ./configure.in 2005-10-26 12:41:18.000000000 +0200 -@@ -1002,26 +1002,11 @@ - AC_SUBST(AVIFILE_BUILD) +diff -ruN avifile-0.6.orig/configure.in avifile-0.6/configure.in +--- avifile-0.6.orig/configure.in 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/configure.in 2007-09-20 21:12:01.000000000 +0200 +@@ -1017,25 +1017,10 @@ + AC_SUBST(Z_LIBS) dnl mpglib/Makefile -dnl ffmpeg/libavfilter/Makefile - dnl libpp/Makefile - AC_OUTPUT( + AC_CONFIG_FILES([ Makefile admin/Makefile - ffmpeg/Makefile @@ -86,20 +25,36 @@ diff -ur avifile-0.6/plugins/libffmpeg/Makefile.am avifile-0.6-fixed/plugins/lib - 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 +- ffmpeg/libpostproc/Makefile +- ffmpeg/libswscale/Makefile drivers/Makefile drivers/libdha/Makefile drivers/libdha/bin/Makefile ---- ./lib/aviread/Makefile.am.orig 2000-01-01 00:00:00.000000000 +0100 -+++ ./lib/aviread/Makefile.am 2005-10-26 12:53:36.000000000 +0200 -@@ -43,24 +43,14 @@ +diff -ruN avifile-0.6.orig/lib/Makefile.am avifile-0.6/lib/Makefile.am +--- avifile-0.6.orig/lib/Makefile.am 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/lib/Makefile.am 2007-09-20 21:12:01.000000000 +0200 +@@ -1,10 +1,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 ++COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" + if AMM_USE_FAST_BUILD + AVISOURCES = libaviplay.cpp + AVILIBADD = +diff -ruN avifile-0.6.orig/lib/aviread/Makefile.am avifile-0.6/lib/aviread/Makefile.am +--- avifile-0.6.orig/lib/aviread/Makefile.am 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/lib/aviread/Makefile.am 2007-09-20 21:13:58.000000000 +0200 +@@ -43,19 +43,7 @@ StreamInfo.cpp @@ -107,24 +62,44 @@ diff -ur avifile-0.6/plugins/libffmpeg/Makefile.am avifile-0.6-fixed/plugins/lib -FF_LIB = \ - ../../ffmpeg/libavformat/libaviplayavformat.la \ - ../../ffmpeg/libavcodec/libaviplayavcodec.la \ +- ../../ffmpeg/libswscale/libaviplayswscale.la \ - ../../ffmpeg/libavutil/libaviplayavutil.la -else -FF_LIB = \ - ../../ffmpeg/libavformat/libavformat.la \ - ../../ffmpeg/libavcodec/libavcodec.la \ +- ../../ffmpeg/libswscale/libswscale.la \ - ../../ffmpeg/libavutil/libavutil.la -endif +FF_LIB = libaviread_la_LIBADD = $(FF_LIB) - AM_CPPFLAGS = $(LTNOPIC) \ - -I$(srcdir)/../common \ -- -I$(srcdir)/../../ffmpeg/libavformat \ +diff -ruN avifile-0.6.orig/plugins/Makefile.am avifile-0.6/plugins/Makefile.am +--- avifile-0.6.orig/plugins/Makefile.am 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/plugins/Makefile.am 2007-09-20 21:12:01.000000000 +0200 +@@ -20,7 +20,7 @@ + + AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \ + -Ilibwin32/videocodec -Ilibwin32/loader \ +- -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \ ++ -Ilibwin32/loader/dshow \ + -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \ + -Ddbg_printf=__vprintf -DTRACE=__vprintf \ + -Wmissing-prototypes -Wimplicit-function-declaration \ +diff -ruN avifile-0.6.orig/plugins/libffmpeg/Makefile.am avifile-0.6/plugins/libffmpeg/Makefile.am +--- avifile-0.6.orig/plugins/libffmpeg/Makefile.am 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/plugins/libffmpeg/Makefile.am 2007-09-20 21:12:01.000000000 +0200 +@@ -20,11 +20,7 @@ + #ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.a + ffmpeg_la_LDFLAGS = -module -avoid-version + +-AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \ - -I$(srcdir)/../../ffmpeg/libavcodec \ -- -I$(srcdir)/../../ffmpeg/libavutil -+ -I/usr/include/ffmpeg \ -+ -I/usr/include/ffmpeg \ -+ -I/usr/include/ffmpeg +- -I$(srcdir)/../../ffmpeg/libavformat \ +- -I$(srcdir)/../../ffmpeg/libavutil \ +- -I$(srcdir)/../../ffmpeg ++AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) + AM_CXXFLAGS = $(CXXRTTIEXCEPT) - MAINTAINERCLEANFILES = Makefile.in + TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) diff --git a/multimedia/avifile/xvid4-needs-libm.patch b/multimedia/avifile/xvid4-needs-libm.patch index c26e4f5c0..3b3fce7de 100644 --- a/multimedia/avifile/xvid4-needs-libm.patch +++ b/multimedia/avifile/xvid4-needs-libm.patch @@ -1,26 +1,12 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../avifile/xvid4-needs-libm.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- ---- avifile-0.7-0.7.41/m4/xvid4.m4~ 2004-02-18 21:55:17.000000000 +0100 -+++ avifile-0.7-0.7.41/m4/xvid4.m4 2004-10-26 18:55:47.122867616 +0200 -@@ -33,7 +33,7 @@ - AC_CHECK_HEADER(xvid.h, have_xvid4=yes) - fi - CPPFLAGS=$ac_save_CPPFLAGS -- XVID4_LIBS="$XVID4_LIBS -lxvidcore" -+ XVID4_LIBS="$XVID4_LIBS -lxvidcore -lm" - - dnl +diff -ruN avifile-0.6.orig/m4/xvid4.m4 avifile-0.6/m4/xvid4.m4 +--- avifile-0.6.orig/m4/xvid4.m4 2000-01-01 00:00:00.000000000 +0100 ++++ avifile-0.6/m4/xvid4.m4 2007-09-19 20:03:26.000000000 +0200 +@@ -35,7 +35,7 @@ dnl Now check if the installed XviD is sufficiently new. + dnl + AC_AVM_CHECK_LIB(xvid4, [for xvid_global in -lxvidcore (4)], +- XVID4_CFLAGS, XVID4_LIBS, -lxvidcore, [ ++ XVID4_CFLAGS, XVID4_LIBS, -lxvidcore -lm, [ + #include + #include + #include ], [