mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Split X11 support to libgstvaapi-x11-*.so.*

Browse source
This commit is contained in:
gb 2010-03-16 09:39:07 +00:00
parent d6a6c1ef98
commit ad54bcf903
4 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -66,6 +66,11 @@ dnl Check for tools
AC_PROG_CC AC_PROG_CC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
dnl Check for GLib
PKG_CHECK_MODULES([GLIB], [glib-2.0])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
dnl Check for GStreamer dnl Check for GStreamer
PKG_CHECK_MODULES([GST], PKG_CHECK_MODULES([GST],
[gstreamer-$GST_MAJORMINOR >= $GST_VERSION_REQUIRED] [gstreamer-$GST_MAJORMINOR >= $GST_VERSION_REQUIRED]

52
gst-libs/gst/vaapi/Makefile.am
View file

@ -1,4 +1,10 @@
lib_LTLIBRARIES = libgstvaapi-@GST_MAJORMINOR@.la lib_LTLIBRARIES = \
libgstvaapi-@GST_MAJORMINOR@.la \
libgstvaapi-x11-@GST_MAJORMINOR@.la \
$(NULL)
libgstvaapi_includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vaapi
libgstvaapi_source_c = \ libgstvaapi_source_c = \
gstvaapidisplay.c \ gstvaapidisplay.c \
@ -34,6 +40,23 @@ libgstvaapi_source_priv_h = \
gstvaapiutils.h \ gstvaapiutils.h \
$(NULL) $(NULL)
libgstvaapi_x11_source_c = \
gstvaapidisplay_x11.c \
gstvaapiutils.c \
gstvaapiutils_x11.c \
gstvaapiwindow_x11.c \
$(NULL)
libgstvaapi_x11_source_h = \
gstvaapidisplay_x11.h \
gstvaapiwindow_x11.h \
$(NULL)
libgstvaapi_x11_source_priv_h = \
gstvaapiutils.h \
gstvaapiutils_x11.h \
$(NULL)
libgstvaapi_@GST_MAJORMINOR@_la_SOURCES = \ libgstvaapi_@GST_MAJORMINOR@_la_SOURCES = \
$(libgstvaapi_source_c) \ $(libgstvaapi_source_c) \
$(libgstvaapi_source_priv_h) \ $(libgstvaapi_source_priv_h) \
@ -44,7 +67,7 @@ libgstvaapi_@GST_MAJORMINOR@include_HEADERS = \
$(NULL) $(NULL)
libgstvaapi_@GST_MAJORMINOR@includedir = \ libgstvaapi_@GST_MAJORMINOR@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vaapi $(libgstvaapi_includedir)
libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS = \ libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -59,24 +82,29 @@ libgstvaapi_@GST_MAJORMINOR@_la_LIBADD = \
$(LIBVA_LIBS) \ $(LIBVA_LIBS) \
$(NULL) $(NULL)
libgstvaapi_@GST_MAJORMINOR@_la_SOURCES += \ libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES = \
gstvaapidisplay_x11.c \ $(libgstvaapi_x11_source_c) \
gstvaapiutils_x11.c \ $(libgstvaapi_x11_source_priv_h) \
gstvaapiwindow_x11.c \
$(NULL) $(NULL)
libgstvaapi_@GST_MAJORMINOR@include_HEADERS += \ libgstvaapi_x11_@GST_MAJORMINOR@include_HEADERS = \
gstvaapidisplay_x11.h \ $(libgstvaapi_x11_source_h) \
gstvaapiutils_x11.h \
gstvaapiwindow_x11.h \
$(NULL) $(NULL)
libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS += \ libgstvaapi_x11_@GST_MAJORMINOR@includedir = \
$(libgstvaapi_includedir)
libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(LIBVA_X11_CFLAGS) \ $(LIBVA_X11_CFLAGS) \
$(NULL) $(NULL)
libgstvaapi_@GST_MAJORMINOR@_la_LIBADD += \ libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD = \
$(GLIB_LIBS) \
$(LIBVA_X11_LIBS) \ $(LIBVA_X11_LIBS) \
libgstvaapi-@GST_MAJORMINOR@.la \
$(NULL) $(NULL)
# Extra clean files so that maintainer-clean removes *everything* # Extra clean files so that maintainer-clean removes *everything*

2
sys/vaapisink/Makefile.am
View file

@ -4,7 +4,7 @@ libgstvaapi_CFLAGS = \
-I$(top_srcdir)/gst-libs -I$(top_srcdir)/gst-libs
libgstvaapi_LIBS = \ libgstvaapi_LIBS = \
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
libgstvaapisink_la_SOURCES = \ libgstvaapisink_la_SOURCES = \
gstvaapisink.c \ gstvaapisink.c \

2
tests/Makefile.am
View file

@ -10,7 +10,7 @@ TEST_CFLAGS = \
$(X11_CFLAGS) $(X11_CFLAGS)
TEST_LIBS = \ TEST_LIBS = \
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la \
$(X11_LIBS) $(X11_LIBS)
test_display_SOURCES = test-display.c test_display_SOURCES = test-display.c