diff options
author | vs <vs@FreeBSD.org> | 2004-05-26 18:12:14 +0800 |
---|---|---|
committer | vs <vs@FreeBSD.org> | 2004-05-26 18:12:14 +0800 |
commit | 624e3f501a413bdd5552f56668b67be8e54512ec (patch) | |
tree | 59ac2b8b5c08eba3e9e4d66d644832c5de3369cb /net/opal | |
parent | 727ac22dd5413d6ebbf013dbb3f1250245db3705 (diff) | |
download | freebsd-ports-gnome-624e3f501a413bdd5552f56668b67be8e54512ec.tar.gz freebsd-ports-gnome-624e3f501a413bdd5552f56668b67be8e54512ec.tar.zst freebsd-ports-gnome-624e3f501a413bdd5552f56668b67be8e54512ec.zip |
Fix build-issue when ffmpeg is installed.
PR: ports/59615
Submitted by: ume
Approved by: maintainer silence
Diffstat (limited to 'net/opal')
-rw-r--r-- | net/opal/files/patch-configurein | 25 | ||||
-rw-r--r-- | net/opal/files/patch-src::h263codec.cxx | 13 |
2 files changed, 35 insertions, 3 deletions
diff --git a/net/opal/files/patch-configurein b/net/opal/files/patch-configurein index 3d6ff53673a9..edff8fef174b 100644 --- a/net/opal/files/patch-configurein +++ b/net/opal/files/patch-configurein @@ -1,6 +1,8 @@ -*** configure.in.orig Thu May 22 13:25:00 2003 ---- configure.in Sat Aug 23 07:52:44 2003 -*************** fi +Index: configure.in +diff -c configure.in.orig configure.in +*** configure.in.orig Thu May 22 21:25:00 2003 +--- configure.in Sun Nov 23 22:51:33 2003 +*************** *** 73,85 **** dnl ######################################################################## @@ -29,3 +31,20 @@ PWLIBDIR="/usr/local/share/pwlib/" fi echo "PWLib prefix set to.... $PWLIBDIR" +*************** +*** 96,102 **** + else + AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) + if test "${H323_AVCODEC:-unset}" != "unset" ; then +! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg + AVCODECLIBDIR=/usr/local/lib + fi + fi +--- 96,102 ---- + else + AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) + if test "${H323_AVCODEC:-unset}" != "unset" ; then +! AVCODECINCLUDEDIR=/usr/local/include + AVCODECLIBDIR=/usr/local/lib + fi + fi diff --git a/net/opal/files/patch-src::h263codec.cxx b/net/opal/files/patch-src::h263codec.cxx new file mode 100644 index 000000000000..d8b45f8b078f --- /dev/null +++ b/net/opal/files/patch-src::h263codec.cxx @@ -0,0 +1,13 @@ +Index: src/h263codec.cxx +diff -u src/h263codec.cxx.orig src/h263codec.cxx +--- src/h263codec.cxx.orig Fri Jun 6 15:32:08 2003 ++++ src/h263codec.cxx Sat Nov 22 23:17:45 2003 +@@ -109,7 +109,7 @@ + #include "rtp.h" + + extern "C" { +-#include <avcodec.h> ++#include <ffmpeg/avcodec.h> + }; + + |