From 2dd8dd1d203254ceb7ba34a5d97b3d093cbe8f93 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 7 Nov 2013 10:53:25 +0100 Subject: [PATCH] raspi: rename EGL_CFLAGS to OMX_CFLAGS we are not really interested in EGL but in OpenMAX ;-) --- configure.ac | 19 +++++++------------ raspi/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 50b6026..964f5fc 100644 --- a/configure.ac +++ b/configure.ac @@ -32,20 +32,15 @@ if test x$BOXTYPE = xgeneric; then PKG_CHECK_MODULES([SWSCALE], [libswscale]) PKG_CHECK_MODULES([SWRESAMPLE], [libswresample]) else - # egl are the broadcom userspace libs - # e.g. yocto (openembedded) has a egl package built from userland git. + # openmaxil are the broadcom userspace libs + # my yocto (openembedded) layer has an openmaxil package built from userland git. # Use that if available. If not, just fall back to /opt/vc/... + # can be overridden with OMX_CFLAGS= OMX_LIBS= variables... # - # note the ugly EGL_LIBS hack: egl package actually only really supplies - # the include paths and linker paths, we don't want to really link against - # libGLESv2 and libEGL, so I'm overriding the pkg-config result and add the - # openmaxil etc... libs manually - PKG_CHECK_MODULES([EGL], [egl], echo "EGL userspace package found. Good." - _PKG_CONFIG(EGL_LIBS, [libs-only-L], [egl]) - EGL_LIBS="$EGL_LIBS -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -pthread", - [ echo "EGL package not found, assuming /opt/vc/..." - EGL_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux" - EGL_LIBS="-L/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -pthread" + PKG_CHECK_MODULES([OMX], [openmaxil], echo "OpenMAX/IL userspace package found. Good.", + [ echo "OpenMAX/IL package not found, assuming /opt/vc/..." + OMX_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux" + OMX_LIBS="-L/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -pthread" ]) # raspbian has no current versions and only libav instead of ffmpeg... :-( PKG_CHECK_MODULES([AVFORMAT], [libavformat]) diff --git a/raspi/Makefile.am b/raspi/Makefile.am index 53906e9..cf9d148 100644 --- a/raspi/Makefile.am +++ b/raspi/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libraspi.la AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS AM_CPPFLAGS += -DUSE_VCHIQ_ARM -DOMX -DOMX_SKIP64BIT -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST AM_CPPFLAGS += \ - @EGL_CFLAGS@ \ + @OMX_CFLAGS@ \ -I$(top_srcdir)/include \ -I$(top_srcdir)/common @@ -13,7 +13,7 @@ AM_LDFLAGS = \ @AVFORMAT_LIBS@ \ @AVUTIL_LIBS@ \ @AVCODEC_LIBS@ \ - @EGL_LIBS@ \ + @OMX_LIBS@ \ -lOpenThreads libraspi_la_SOURCES = \