cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix upcoming mjpegtools 2.0 detection.

Browse Source 
from Brad
This commit is contained in:
ajacoutot 2011-10-13 06:02:25 +00:00
parent 25d26710b1
commit 33329c4ba8
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.13 2011/10/06 08:45:23 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.14 2011/10/13 06:02:25 ajacoutot Exp $
--- configure.ac.orig Mon May 9 16:45:37 2011
+++ configure.ac Wed Oct 5 05:09:47 2011
+++ configure.ac Wed Oct 12 17:57:00 2011
@@ -402,7 +402,7 @@ if test "x$HAVE_WINSOCK2_H" = "xyes"; then
fi
@ -68,7 +68,40 @@ $OpenBSD: patch-configure_ac,v 1.13 2011/10/06 08:45:23 ajacoutot Exp $
OLD_LIBS="$LIBS"
LIBS="$LIBS $MPEG2ENC_LIBS"
AC_MSG_CHECKING([for valid mpeg2enc objects])
@@ -1467,7 +1471,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
@@ -1119,7 +1123,7 @@ AG_GST_CHECK_FEATURE(MPEG2ENC, [mpeg2enc], mpeg2enc, [
if test "x$mpeg2enc_headers_ok" = "xyes"; then
HAVE_MPEG2ENC="yes"
fi
- CPP_FLAGS="$CPPFLAGS_GOOD"
+ CPPFLAGS="$CPPFLAGS_GOOD"
AC_SUBST(MPEG2ENC_CFLAGS)
AC_SUBST(MPEG2ENC_LIBS)
], [
@@ -1147,10 +1151,14 @@ AG_GST_CHECK_FEATURE(MPLEX, [mplex], mplex, [
dnl and mpeg2enc, we check for mplex on its own, too.
dnl libmplex < 1.9rc? has fuzzy ABI, valgrind and other problems
PKG_CHECK_MODULES(MPLEX, mjpegtools >= 1.9.0, [
+ dnl HACK because mplex 2.0.0 header files have a spurious 'include config.h'
+ touch config.h
dnl switch over to c++ to test things
AC_LANG_CPLUSPLUS
OLD_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $MPLEX_CFLAGS"
+ dnl HACK as above
+ CPPFLAGS_GOOD="$CPPFLAGS $MPLEX_CFLAGS"
+ CPPFLAGS="$CPPFLAGS_GOOD -I."
AC_CHECK_HEADER(interact.hpp, [
MPLEX_LIBS="$MPLEX_LIBS -lmplex2 $LIBM"
OLD_LIBS="$LIBS"
@@ -1187,6 +1195,7 @@ main (int argc,
}
],[
HAVE_MPLEX="yes"
+ CPPFLAGS="$CPPFLAGS_GOOD"
AC_SUBST(MPLEX_CFLAGS)
AC_SUBST(MPLEX_LIBS)
AC_SUBST(MPLEX_LDFLAGS)
@@ -1467,7 +1476,7 @@ AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
HAVE_XVID=no
AC_CHECK_HEADER(xvid.h, [
OLD_LIBS="$LIBS"
@ -77,7 +110,7 @@ $OpenBSD: patch-configure_ac,v 1.13 2011/10/06 08:45:23 ajacoutot Exp $
AC_CHECK_LIB(xvidcore, xvid_encore, [
AC_CHECK_LIB(xvidcore, xvid_decore, [
AC_CHECK_LIB(xvidcore, xvid_global, [
@@ -1575,6 +1579,8 @@ AG_GST_CHECK_FEATURE(ZBAR, [ZBar barcode detector], zb
@@ -1575,6 +1584,8 @@ AG_GST_CHECK_FEATURE(ZBAR, [ZBar barcode detector], zb
dnl *** vp8 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_VP8, vp8)
@ -86,7 +119,7 @@ $OpenBSD: patch-configure_ac,v 1.13 2011/10/06 08:45:23 ajacoutot Exp $
AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
VPX_LIBS=""
AG_GST_CHECK_LIBHEADER(VPX, vpx,
@@ -1583,8 +1589,6 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
@@ -1583,8 +1594,6 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
HAVE_VP8_ENCODER=no
HAVE_VP8_DECODER=no
@ -95,7 +128,7 @@ $OpenBSD: patch-configure_ac,v 1.13 2011/10/06 08:45:23 ajacoutot Exp $
AC_CHECK_LIB(vpx, vpx_codec_vp8_cx_algo, [
HAVE_VP8=yes
AC_DEFINE(HAVE_VP8_ENCODER, 1, [Defined if the VP8 encoder is available])
@@ -1595,10 +1599,10 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
@@ -1595,10 +1604,10 @@ AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [
AC_DEFINE(HAVE_VP8_DECODER, 1, [Defined if the VP8 decoder is available])
VPX_LIBS="-lvpx"
])