Added TI patches, generated from commit 04f9d72 of the following tree:
[ubuntu-omap:gst-plugins-bad1-0.git] / debian / patches / 0099-drm-kms-dri2-Properly-build-against-GST_VIDEO.patch
1 From 17295bd1d1f76c5d0c502acdfb148004b95028b3 Mon Sep 17 00:00:00 2001
2 From: Thibault Saunier <thibault.saunier@collabora.com>
3 Date: Thu, 20 Dec 2012 13:05:14 -0300
4 Subject: [PATCH 099/100] drm, kms, dri2: Properly build against GST_VIDEO
5
6 ---
7  configure.ac                 |    5 +++--
8  gst-libs/sys/drm/Makefile.am |    2 ++
9  sys/dri2/Makefile.am         |    4 ++--
10  sys/kms/Makefile.am          |    3 ++-
11  4 files changed, 9 insertions(+), 5 deletions(-)
12
13 diff --git a/configure.ac b/configure.ac
14 index f4fa7e8..bec299c 100644
15 --- a/configure.ac
16 +++ b/configure.ac
17 @@ -1123,6 +1123,7 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_KMS, true)
18  AG_GST_CHECK_FEATURE(KMS, [kmssink], kms, [
19    PKG_CHECK_MODULES([DRM], [libdrm libdrm_omap], HAVE_KMS=yes, HAVE_KMS=no)
20    PKG_CHECK_MODULES(LIBDCE, [libdce >= 1.0.0], HAVE_KMS=yes, HAVE_KMS=no)
21 +  AG_GST_PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-$GST_API_VERSION)
22    AC_SUBST(DRM_CFLAGS)
23    AC_SUBST(DRM_LIBS)
24  ])
25 @@ -1872,9 +1873,9 @@ AG_GST_CHECK_FEATURE(GSETTINGS, [GSettings plugin], gsettings, [
26    fi
27  ])
28  
29 -dnl *** drm ***
30 +dnl *** gstdrm ***
31  HAVE_DRM=NO
32 -PKG_CHECK_MODULES([DRM], [libdrm, libdrm_omap], HAVE_DRM=yes, HAVE_DRM=no)
33 +PKG_CHECK_MODULES([DRM], [libdrm, libdrm_omap, gstreamer-video-@GST_API_VERSION], HAVE_DRM=yes, HAVE_DRM=no)
34  AM_CONDITIONAL(HAVE_DRM, test "x$HAVE_DRM" = "xyes")
35  
36  dnl *** sndio ***
37 diff --git a/gst-libs/sys/drm/Makefile.am b/gst-libs/sys/drm/Makefile.am
38 index 09d977c..af5e180 100644
39 --- a/gst-libs/sys/drm/Makefile.am
40 +++ b/gst-libs/sys/drm/Makefile.am
41 @@ -14,6 +14,7 @@ libgstdrm_@GST_API_VERSION@include_HEADERS = \
42  
43  libgstdrm_@GST_API_VERSION@_la_CFLAGS = \
44         $(DRM_CFLAGS) \
45 +       $(GST_VIDEO_CFLAGS) \
46         $(GST_PLUGINS_BAD_CFLAGS) \
47         $(GST_PLUGINS_BASE_CFLAGS) \
48         -DGST_USE_UNSTABLE_API \
49 @@ -22,6 +23,7 @@ libgstdrm_@GST_API_VERSION@_la_CFLAGS = \
50  libgstdrm_@GST_API_VERSION@_la_LIBADD = \
51         $(DRM_LIBS) \
52         $(top_builddir)/gst-libs/sys/dma/libgstdmabuf-$(GST_API_VERSION).la \
53 +       $(GST_VIDEO_LIBS) \
54         $(GST_PLUGINS_BASE_LIBS) \
55         $(GST_BASE_LIBS) \
56         $(GST_LIBS)
57 diff --git a/sys/dri2/Makefile.am b/sys/dri2/Makefile.am
58 index 09125b4..d97c096 100644
59 --- a/sys/dri2/Makefile.am
60 +++ b/sys/dri2/Makefile.am
61 @@ -7,11 +7,11 @@ libgstdri2_la_SOURCES = \
62         gstdri2util.c
63  
64  libgstdri2_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
65 -               $(GST_CFLAGS) $(DRI2_CFLAGS) $(GST_VIDEO)
66 +               $(GST_CFLAGS) $(DRI2_CFLAGS) $(GST_VIDEO_CFLAGS)
67  
68  libgstdri2_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
69         $(GST_PLUGINS_BASE_LIBS) $(GST_PLUGINS_BAD_LIBS) $(X11_LIBS) $(DRI2_LIBS) \
70 -       $(LIBM) -lgstvideo-$(GST_API_VERSION) \
71 +       $(LIBM)  $(GST_VIDEO_LIBS) \
72         $(top_builddir)/gst-libs/sys/dma/libgstdmabuf-$(GST_API_VERSION).la \
73         $(top_builddir)/gst-libs/sys/drm/libgstdrm-$(GST_API_VERSION).la
74  
75 diff --git a/sys/kms/Makefile.am b/sys/kms/Makefile.am
76 index dee88c9..eed736a 100644
77 --- a/sys/kms/Makefile.am
78 +++ b/sys/kms/Makefile.am
79 @@ -9,6 +9,7 @@ libgstkmssink_la_CFLAGS = \
80         $(GST_PLUGINS_BAD_CFLAGS) \
81         $(GST_PLUGINS_BASE_CFLAGS) \
82         $(GST_BASE_CFLAGS) \
83 +       $(GST_VIDEO_CFLAGS) \
84         $(LIBDCE_CFLAGS) \
85         $(GST_CFLAGS) \
86         $(DRM_CFLAGS)
87 @@ -17,9 +18,9 @@ libgstkmssink_la_LIBADD = \
88         $(GST_PLUGINS_BASE_LIBS) \
89         $(GST_BASE_LIBS) \
90         $(GST_LIBS) \
91 +       $(GST_VIDEO_LIBS) \
92         $(LIBDCE_LIBS) \
93         $(DRM_LIBS) \
94 -       -lgstvideo-$(GST_API_VERSION) \
95         $(top_builddir)/gst-libs/sys/dma/libgstdmabuf-$(GST_API_VERSION).la \
96         $(top_builddir)/gst-libs/sys/drm/libgstdrm-$(GST_API_VERSION).la
97  
98 -- 
99 1.7.9.5
100