57 lines
1.6 KiB
Plaintext
57 lines
1.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2012/08/29 07:48:42 ajacoutot Exp $
|
|
--- configure.orig Fri Nov 2 15:02:31 2007
|
|
+++ configure Mon Jan 2 17:53:12 2012
|
|
@@ -36499,8 +36502,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${a
|
|
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
extern "C" {
|
|
- #include <ffmpeg/avformat.h>
|
|
- #include <ffmpeg/avcodec.h>
|
|
+ #include <libavformat/avformat.h>
|
|
+ #include <libavcodec/avcodec.h>
|
|
}
|
|
|
|
int main() {
|
|
@@ -36537,11 +36540,11 @@ fi
|
|
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
OLD_LIBS=$LIBS
|
|
- LIBS="-lavformat -lavcodec $LIBS"
|
|
+ LIBS="$(pkg-config --libs libavcodec libavformat) $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
extern "C" {
|
|
- #include <ffmpeg/avformat.h>
|
|
- #include <ffmpeg/avcodec.h>
|
|
+ #include <libavformat/avformat.h>
|
|
+ #include <libavcodec/avcodec.h>
|
|
}
|
|
|
|
int main() {
|
|
@@ -36784,7 +36787,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_process
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lFLAC $all_libraries $LIBS"
|
|
+LIBS="-lFLAC -logg -lm $all_libraries $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -37326,7 +37329,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${a
|
|
|
|
|
|
|
|
-for ac_header in mpcdec/mpcdec.h
|
|
+for ac_header in mpc/mpcdec.h
|
|
do
|
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
@@ -37528,7 +37531,7 @@ if test $ac_cv_lib_mpcdec_mpc_decoder_setup = yes; the
|
|
MPC_LIBS="-lmpcdec"
|
|
|
|
cat >>confdefs.h <<\_ACEOF
|
|
-#define MPC_HEADER_FILE <mpcdec/mpcdec.h>
|
|
+#define MPC_HEADER_FILE <mpc/mpcdec.h>
|
|
_ACEOF
|
|
|
|
|