kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/multimedia/kdemultimedia3/patches/patch-aa
markd 8134db3e94 Update to kde3.5.9 
Minor bugfixes
2008-02-20 10:00:24 +00:00

252 lines
8.2 KiB
Text
Raw Blame History

$NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $
--- configure.orig 2007-10-09 03:27:15.000000000 +1300
+++ configure
@@ -34934,7 +34910,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lossaudio $LIBS"
+LIBS="${LIBOSSAUDIO} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -34998,7 +34974,7 @@ fi
if test "x$have_ossaudio" = xyes; then
# for kmix/ and akode/
- LIBOSSAUDIO="-lossaudio"
+ LIBOSSAUDIO="${LIBOSSAUDIO}"
fi
@@ -35571,7 +35547,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <cdda_interface.h>
+#include <cdparanoia/cdda_interface.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -35611,7 +35587,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <cdda_interface.h>
+#include <cdparanoia/cdda_interface.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -35712,7 +35688,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <cdda_interface.h>
+ #include <cdparanoia/cdda_interface.h>
int
main ()
@@ -37701,7 +37677,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetTRMC
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltunepimp $LIBS"
+LIBS="-ltunepimp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -38572,13 +38548,13 @@ if test $ac_cv_header_FLAC_metadata_h =
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
- { echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_process_single in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__seekable_stream_decoder_process_single in -lFLAC... $ECHO_C" >&6; }
-if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single+set}" = set; then
+ { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_process_single in -lFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lFLAC $LIBS"
+LIBS="-lFLAC -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -38592,11 +38568,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char FLAC__seekable_stream_decoder_process_single ();
+char FLAC__stream_decoder_process_single ();
int
main ()
{
-return FLAC__seekable_stream_decoder_process_single ();
+return FLAC__stream_decoder_process_single ();
;
return 0;
}
@@ -38619,21 +38595,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=yes
+ ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=no
+ ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&6; }
-if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" >&6; }
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_process_single = yes; then
have_libFLAC=yes
fi
@@ -38827,9 +38803,9 @@ if test $ac_cv_header_OggFLAC_seekable_s
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
- { echo "$as_me:$LINENO: checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC" >&5
-echo $ECHO_N "checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC... $ECHO_C" >&6; }
-if test "${ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single+set}" = set; then
+ { echo "$as_me:$LINENO: checking for OggFLAC__stream_decoder_process_single in -lOggFLAC" >&5
+echo $ECHO_N "checking for OggFLAC__stream_decoder_process_single in -lOggFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -38847,11 +38823,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char OggFLAC__seekable_stream_decoder_process_single ();
+char OggFLAC__stream_decoder_process_single ();
int
main ()
{
-return OggFLAC__seekable_stream_decoder_process_single ();
+return OggFLAC__stream_decoder_process_single ();
;
return 0;
}
@@ -38874,21 +38850,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=yes
+ ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=no
+ ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&5
-echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&6; }
-if test $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single" >&5
+echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single" >&6; }
+if test $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single = yes; then
have_libOggFLAC=yes
fi
@@ -40652,7 +40628,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+ lib=Xxf86dga
+ shared_lib_found=no
+ for i in ${LDFLAGS}; do
+ case "$i" in
+ -L*)
+ dir=`echo $i | sed "s,^-L,,"`
+ if [ -e $dir/lib${lib}.so ] ||
+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
+ shared_lib_found=yes
+ break;
+ fi
+ esac
+ done
+ if [ "$shared_lib_found" = "yes" ]; then
x11_dga2=yes
+ fi
else
echo "$as_me: failed program was:" >&5
@@ -40713,7 +40704,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+ lib=Xv
+ shared_lib_found=no
+ for i in ${LDFLAGS}; do
+ case "$i" in
+ -L*)
+ dir=`echo $i | sed "s,^-L,,"`
+ if [ -e $dir/lib${lib}.so ] ||
+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
+ shared_lib_found=yes
+ break;
+ fi
+ esac
+ done
+ if [ "$shared_lib_found" = "yes" ]; then
x11_xv=yes
+ fi
else
echo "$as_me: failed program was:" >&5
@@ -40774,7 +40780,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+ lib=Xxf86vm
+ shared_lib_found=no
+ for i in ${LDFLAGS}; do
+ case "$i" in
+ -L*)
+ dir=`echo $i | sed "s,^-L,,"`
+ if [ -e $dir/lib${lib}.so ] ||
+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
+ shared_lib_found=yes
+ break;
+ fi
+ esac
+ done
+ if [ "$shared_lib_found" = "yes" ]; then
x11_xvidmode=yes
+ fi
else
echo "$as_me: failed program was:" >&5
@@ -45675,11 +45668,6 @@ done # for ac_tag
{ (exit 0); exit 0; }
_ACEOF
-if test "x$with_fast_perl" = "xyes"; then
- perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS \
- || mv $CONFIG_STATUS.bak $CONFIG_STATUS
- rm -f $CONFIG_STATUS.bak
-fi
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
Reference in a new issue View git blame Copy permalink