diff options
| author | marcus <marcus@FreeBSD.org> | 2008-08-11 12:33:45 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2008-08-11 12:33:45 +0800 |
| commit | c7a1d9e0a03cbd4e0b34b991d8a042d4312ee8da (patch) | |
| tree | f7151064215c80b22f44709596d2818d85b98952 /multimedia/ffmpeg | |
| parent | a79c37ab228a6c3891466241fb16f62e9317d635 (diff) | |
| download | freebsd-ports-gnome-c7a1d9e0a03cbd4e0b34b991d8a042d4312ee8da.tar.gz freebsd-ports-gnome-c7a1d9e0a03cbd4e0b34b991d8a042d4312ee8da.tar.zst freebsd-ports-gnome-c7a1d9e0a03cbd4e0b34b991d8a042d4312ee8da.zip | |
Append -I${includedir}/ffmpeg on to the Cflags in the pkg-config files.
This is known to fix the build of audio/picard, and maybe other ports as
well.
Reported by: erwin
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-configure | 23 |
2 files changed, 17 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index b7fb53573241..30ebe348e3fd 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2008-07-27 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index 6cd22b93ed1e..ce62c6afcb10 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2008-07-24 05:53:32.000000000 -0500 -+++ configure 2008-07-27 17:31:20.767081842 -0500 -@@ -1596,8 +1596,8 @@ +--- configure.orig 2008-07-24 06:53:32.000000000 -0400 ++++ configure 2008-08-11 00:23:15.000000000 -0400 +@@ -1596,8 +1596,8 @@ od -A n -t x1 $TMPO | grep -q '42 *49 *4 if check_func dlopen; then ldl= @@ -11,7 +11,7 @@ fi check_func fork -@@ -1718,10 +1718,17 @@ +@@ -1718,10 +1718,17 @@ fi if enabled vhook; then check_ldflags -rdynamic check_ldflags -export-dynamic @@ -31,7 +31,7 @@ ########################################## # SDL check -@@ -2072,7 +2079,7 @@ +@@ -2072,7 +2079,7 @@ get_version(){ eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO lcname=$(tolower $name) eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak @@ -40,12 +40,21 @@ } get_version LIBSWSCALE libswscale/swscale.h -@@ -2096,7 +2103,7 @@ +@@ -2096,7 +2103,7 @@ if enabled shared; then echo "SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}" >> config.mak fi echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak -echo "EXTRALIBS=$extralibs" >> config.mak -+echo "EXTRALIBS=-L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib $extralibs" >> config.mak ++echo "EXTRALIBS=-L/usr/local/lib -L/usr/local/lib -L/usr/local/lib $extralibs" >> config.mak print_config ARCH_ $TMPH config.mak $ARCH_LIST print_config HAVE_ $TMPH config.mak $HAVE_LIST +@@ -2206,7 +2213,7 @@ Requires.private: $(enabled shared && ec + Conflicts: + Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs) + Libs.private: $(enabled shared && echo $libs) +-Cflags: -I\${includedir} ++Cflags: -I\${includedir} -I\${includedir}/ffmpeg + EOF + cat <<EOF > $name/$name-uninstalled.pc + prefix= |