openbsd-ports/multimedia/xine-lib/patches/patch-configure
naddy c032f9228c Fix a quoting error in the configure script. (Nesting double and backquotes
is tricky and set -o posix changes the behavior.)

Sync WANTLIB while here.
2007-05-01 20:20:48 +00:00

136 lines
3.6 KiB
Plaintext

$OpenBSD: patch-configure,v 1.7 2007/05/01 20:20:49 naddy Exp $
--- configure.orig Sun Jul 9 16:51:14 2006
+++ configure Tue May 1 22:06:27 2007
@@ -25613,8 +25613,12 @@ _ACEOF
fi
done
+LIBICONV=$LTLIBICONV
+LIBINTL=$LTLIBINTL
+INTLLIBS=$LTLIBINTL
+
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
@@ -27729,6 +27733,13 @@ echo "$as_me: WARNING:
fi
;;
+ *-*-openbsd*)
+ THREAD_LIBS="-pthread"
+ THREAD_CPPFLAGS="-pthread"
+ have_pthread=yes
+
+ ;;
+
*-*-hpux11*)
THREAD_LIBS="-lpthread"
have_pthread=yes
@@ -28905,7 +28916,7 @@ fi
"ac_cv_lib_avcodec_pp_get_context" \
"ac_cv_lib_postproc_pp_get_context" \
"ac_cv_lib_avcodec_register_avcodec"; do
- $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
+ $as_unset $i || test "$i+set" != set || { $i=; export $i; }
done
if test "${ac_cv_header_avcodec_h+set}" = set; then
@@ -33078,8 +33089,12 @@ _ACEOF
ac_have_xv="yes"
+
+XV_LIB="-lXv"
+
+if test 0 -eq 1 ; then
case x$XV_LIB in
- x*.a)
+ x*_pic.a)
cat >>confdefs.h <<\_ACEOF
#define HAVE_XV_STATIC 1
@@ -33088,8 +33103,8 @@ _ACEOF
ac_have_xv_static="yes"
XV_LIB="$xv_path/$XV_LIB"
;;
- x*.so)
- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
+ x*.so.*)
+ XV_LIB="-lXv"
;;
*)
{ { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB" >&5
@@ -33113,6 +33128,7 @@ fi
fi
+fi
if test x$ac_have_xv = "xyes"; then
HAVE_XV_TRUE=
@@ -40297,7 +40313,7 @@ elif test x"$external_a52dec" = "xyes"; then
have_a52="yes"
-for ac_header in a52dec/a52.h a52dec/a52_internal.h
+for ac_header in a52dec/a52.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -40469,7 +40485,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
- LIBS="-la52 $LIBS"
+ LIBS="-la52 -lm $LIBS"
else
have_a52="no"
@@ -40900,7 +40916,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmng $LIBS"
+LIBS="-lmng -llcms -ljpeg -lz -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -41123,7 +41139,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_cv_header_libmng_h = yes; then
have_libmng=yes
- MNG_LIBS="-lmng"
+ MNG_LIBS="-lmng -llcms -ljpeg -lz -lm"
else
{ echo "$as_me:$LINENO: result: *** All libmng dependent parts will be disabled ***" >&5
echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6; }
@@ -53028,7 +53044,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
CFLAGS="$CFLAGS -faltivec"
- LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -faltivec"
+ LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -faltivec"
fi
;;
ppc-*-linux* | powerpc-*)
@@ -53208,7 +53224,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
CFLAGS="$CFLAGS -maltivec"
- LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -maltivec"
+ LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -maltivec"
fi
;;
sparc*-*-linux*)
@@ -53489,7 +53505,7 @@ eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
XINE_BUILD_CC="`$CC -v 2>&1 | tail -n 1`"
XINE_BUILD_OS="`uname -s -r -m`"
-XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`"
+XINE_BUILD_DATE=`date "+%a %d %b %Y %T"`