Remove libdrm_slp dependency

diff --git a/configure.ac b/configure.ac
index 3d94ad7..ca8327a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -933,11 +933,16 @@ PKG_CHECK_MODULES(DRI2PROTO, dri2proto)
 AC_SUBST(DRI2PROTO_CFLAGS)
 AC_SUBST(DRI2PROTO_LIBS)
 
-dnl use dri2proto
+dnl use dri2
 PKG_CHECK_MODULES(DRI2, libdri2)
 AC_SUBST(DRI2_CFLAGS)
 AC_SUBST(DRI2_LIBS)
 
+dnl use tbm
+PKG_CHECK_MODULES(TBM, libtbm)
+AC_SUBST(TBM_CFLAGS)
+AC_SUBST(TBM_LIBS)
+
 dnl *** output files ***
 
 AC_CONFIG_FILES(

diff --git a/packaging/gst-plugins-base.spec b/packaging/gst-plugins-base.spec
index ec435c3..43df33d 100644 (file)
--- a/packaging/gst-plugins-base.spec
+++ b/packaging/gst-plugins-base.spec
@@ -1,7 +1,7 @@
 Name:       gst-plugins-base
 Summary:    GStreamer streaming media framework base plug-ins
 Version:    0.10.36
-Release:    20
+Release:    21
 Group:      Applications/Multimedia
 License:    LGPLv2+
 Source0:    %{name}-%{version}.tar.gz
@@ -21,7 +21,7 @@ BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(libdri2)
-BuildRequires:  pkgconfig(libdrm_slp)
+BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  intltool
 
 

diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index d4e16cd..380c194 100644 (file)
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstxvimagesink.la
 
 libgstxvimagesink_la_SOURCES =  xvimagesink.c 
-libgstxvimagesink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(XFIXES_CFLAGS) $(DRI2PROTO_CFLAGS) $(DRI2_CFLAGS)
+libgstxvimagesink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(XFIXES_CFLAGS) $(DRI2PROTO_CFLAGS) $(DRI2_CFLAGS) $(TBM_CFLAGS)
 libgstxvimagesink_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
@@ -10,6 +10,7 @@ libgstxvimagesink_la_LIBADD = \
        $(XFIXES_LIBS) \
        $(DRI2PROTO_LIBS) \
        $(DRI2_LIBS) \
+       $(TBM_LIBS) \
        $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) $(LIBM)
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index bf264cc..51f145d 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -140,9 +140,10 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
 #include <X11/Xmd.h>
 #include <dri2/dri2.h>
-#include <libdrm/drm.h>
 
 typedef enum {
        BUF_SHARE_METHOD_PADDR = 0,