ports/multimedia/ffmpeg-devel/files/patch-configure
Michael Johnson d8daebc0e2 - Update to 2007.04.29 snapshot (this will probably be moved to multimedia/ffmpeg, assumeing we have no major problems)
- Add support for libswscale [1]
- Honor CFLAGS [1]
- Update WWW [1]
- Fix build on amd64 [2]
- Replace erroneous tr with a better one [3]
- Better CONFLICTS with multimedia/ffmpeg [4]
- Disable liba52 instead of building internal liba52 if WITHOUT_A52 is defined since it's no longer
  required [5]

PR:		ports/111335 [1]
		ports/111560 [3]
		ports/112068 [4]
		ports/112192 [5]
Submitted by:	thierry [1]
		vanilla (partly submitted by) [2]
		ast@marabu.ch [3]
		Ganael LAPLANCHE <ganael.laplanche@martymac.com> [4]
		Martin Tournoij <carpetsmoker@xs4all.nl> [5]
2007-04-30 15:24:44 +00:00

99 lines
2.9 KiB
Text

--- configure.orig Fri Apr 27 03:13:50 2007
+++ configure Mon Apr 30 09:59:52 2007
@@ -208,11 +208,11 @@
# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
toupper(){
- echo "$@" | tr '[a-z]' '[A-Z]'
+ echo "$@" | tr '[:lower:]' '[:upper:]'
}
tolower(){
- echo "$@" | tr '[A-Z]' '[a-z]'
+ echo "$@" | tr '[:upper:]' '[:lower:]'
}
set_all(){
@@ -986,15 +986,9 @@
enable fast_unaligned
;;
x86_64|amd64)
- arch="x86_32"
enable fast_unaligned
- canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
- arch="x86_64"
- enable fast_64bit
- fi
- fi
+ arch="x86_64"
+ enable fast_64bit
;;
# armv4l is a subset of armv[567]*l
arm|armv[4567]*l)
@@ -1749,14 +1743,14 @@
# not all compilers support -Os
test "$optimize" = "small" && check_cflags -Os
-if enabled optimize; then
- if test -n "`$cc -v 2>&1 | grep xlc`"; then
- add_cflags "-O5"
- add_ldflags "-O5"
- else
- add_cflags "-O3"
- fi
-fi
+#if enabled optimize; then
+# if test -n "`$cc -v 2>&1 | grep xlc`"; then
+# add_cflags "-O5"
+# add_ldflags "-O5"
+# else
+# add_cflags "-O3"
+# fi
+#fi
# PIC flags for shared library objects where they are needed
if enabled shared; then
@@ -1965,15 +1959,15 @@
if enabled shared; then
echo "BUILD_SHARED=yes" >> config.mak
echo "PIC=-fPIC -DPIC" >> config.mak
- echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
+ echo "SPPMAJOR=1" >> config.mak
echo "SPPVERSION=$pp_version" >> config.mak
- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
+ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
echo "LAVCVERSION=$lavc_version" >> config.mak
- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
+ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
echo "LAVFVERSION=$lavf_version" >> config.mak
- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
+ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
echo "LAVUVERSION=$lavu_version" >> config.mak
- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
+ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
echo "SWSVERSION=$sws_version" >> config.mak
echo "SLIBNAME=${SLIBNAME}" >> config.mak
echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
@@ -2095,8 +2089,8 @@
Version: $version
Requires: $requires
Conflicts:
-Libs: -L\${libdir} $libs
-Cflags: -I\${includedir} -I\${includedir}/$include
+Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
+Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include
EOF
}
@@ -2119,7 +2113,8 @@
Requires: $requires
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
-Cflags: -I\${includedir}
+Ldflags: -L%%LOCALBASE%%/lib
+Cflags: -I\${includedir} -I%%LOCALBASE%%/include
EOF
}