kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Append -I${includedir}/ffmpeg on to the Cflags in the pkg-config files.

Browse source 
This is known to fix the build of audio/picard, and maybe other ports as
well.

Reported by:	erwin
This commit is contained in:
Joe Marcus Clarke 2008-08-11 04:33:45 +00:00
parent 4694cc4a34
commit 37fb32fe13
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=218396
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/ffmpeg/Makefile
View file

@ -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

23
multimedia/ffmpeg/files/patch-configure
View file

@ -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=