wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 777166 - Use CFLAGS from pkgconfig for system libvpx, r=derf

Browse Source 
From c445b9ab36a0c79aa1be2dfbd91438e994bccb4e Mon Sep 17 00:00:00 2001
---
 config/autoconf.mk.in          | 2 +-
 configure.in                   | 8 +++++---
 content/media/webm/Makefile.in | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
This commit is contained in:
Bugmenot 2012-07-25 19:54:23 +00:00
parent 6db3c665f0
commit 0a2b3d36c2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -224,7 +224,7 @@ MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
MOZ_LIBVPX_INCLUDES = @MOZ_LIBVPX_INCLUDES@
MOZ_LIBVPX_CFLAGS = @MOZ_LIBVPX_CFLAGS@
MOZ_NATIVE_ZLIB = @MOZ_NATIVE_ZLIB@
MOZ_NATIVE_BZ2 = @MOZ_NATIVE_BZ2@

8
configure.in
View File

@ -5351,7 +5351,7 @@ MOZ_ARG_WITH_BOOL(system-libvpx,
[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
MOZ_NATIVE_LIBVPX=1)
MOZ_LIBVPX_INCLUDES=
MOZ_LIBVPX_CFLAGS=
MOZ_LIBVPX_LIBS=
if test -n "$MOZ_VP8"; then
@ -5368,18 +5368,20 @@ if test -n "$MOZ_VP8"; then
dnl === libvpx Version check ===
dnl ============================
dnl Check to see if we have a system libvpx package.
PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
PKG_CHECK_MODULES(MOZ_LIBVPX, vpx >= 1.0.0)
MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
[AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
_SAVE_LIBS=$LIBS
AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
[AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
LIBS=$_SAVE_LIBS
fi
fi
AC_SUBST(MOZ_NATIVE_LIBVPX)
AC_SUBST(MOZ_LIBVPX_INCLUDES)
AC_SUBST(MOZ_LIBVPX_CFLAGS)
AC_SUBST(MOZ_LIBVPX_LIBS)
if test "$MOZ_WEBM"; then

2
content/media/webm/Makefile.in
View File

@ -30,5 +30,5 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
$(MOZ_LIBVPX_INCLUDES) \
$(MOZ_LIBVPX_CFLAGS) \
$(NULL)