mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-28 07:51:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

raspi: rename EGL_CFLAGS to OMX_CFLAGS

Browse Source 
we are not really interested in EGL but in OpenMAX ;-)
This commit is contained in:
Stefan Seyfried
2013-11-07 10:53:25 +01:00
parent 1b5a6076d9
commit 2dd8dd1d20
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@@ -32,20 +32,15 @@ if test x$BOXTYPE = xgeneric; then
PKG_CHECK_MODULES([SWSCALE], [libswscale]) PKG_CHECK_MODULES([SWSCALE], [libswscale])
PKG_CHECK_MODULES([SWRESAMPLE], [libswresample]) PKG_CHECK_MODULES([SWRESAMPLE], [libswresample])
else else
# egl are the broadcom userspace libs # openmaxil are the broadcom userspace libs
# e.g. yocto (openembedded) has a egl package built from userland git. # my yocto (openembedded) layer has an openmaxil package built from userland git.
# Use that if available. If not, just fall back to /opt/vc/... # 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 PKG_CHECK_MODULES([OMX], [openmaxil], echo "OpenMAX/IL userspace package found. Good.",
# the include paths and linker paths, we don't want to really link against [ echo "OpenMAX/IL package not found, assuming /opt/vc/..."
# libGLESv2 and libEGL, so I'm overriding the pkg-config result and add the OMX_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux"
# openmaxil etc... libs manually OMX_LIBS="-L/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -pthread"
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"
]) ])
# raspbian has no current versions and only libav instead of ffmpeg... :-( # raspbian has no current versions and only libav instead of ffmpeg... :-(
PKG_CHECK_MODULES([AVFORMAT], [libavformat]) PKG_CHECK_MODULES([AVFORMAT], [libavformat])

4
raspi/Makefile.am
View File

@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libraspi.la
AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS 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 += -DUSE_VCHIQ_ARM -DOMX -DOMX_SKIP64BIT -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST
AM_CPPFLAGS += \ AM_CPPFLAGS += \
@EGL_CFLAGS@ \ @OMX_CFLAGS@ \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/common -I$(top_srcdir)/common
@@ -13,7 +13,7 @@ AM_LDFLAGS = \
@AVFORMAT_LIBS@ \ @AVFORMAT_LIBS@ \
@AVUTIL_LIBS@ \ @AVUTIL_LIBS@ \
@AVCODEC_LIBS@ \ @AVCODEC_LIBS@ \
@EGL_LIBS@ \ @OMX_LIBS@ \
-lOpenThreads -lOpenThreads
libraspi_la_SOURCES = \ libraspi_la_SOURCES = \