Skip to contentSkip to conversation

gst1-validate: fix compile with cairo support

PATCH New Peter Seiderer 2 participants 2 messages Oct 27, 2015

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH 1/1 gst1-validate: fix compile with cairo support

In case cairo support is (auto-)detected cairo PNG support is required.

Fixes ([1]):

../gst-libs/gst/video/.libs/libgstvalidatevideo-1.0.so: undefined reference to cairo_surface_write_to_png' ../gst-libs/gst/video/.libs/libgstvalidatevideo-1.0.so: undefined reference to cairo_image_surface_create_from_png'
collect2: error: ld returned 1 exit status

[1] http://autobuild.buildroot.net/results/c5e/c5eb6cb12dba559226c67f5d258cc151aa8a8d3a

Signed-off-by Peter Seiderer <[email protected]>
---
 package/gstreamer1/gst1-validate/Config.in        | 3 +++
 package/gstreamer1/gst1-validate/gst1-validate.mk | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-validate/Config.in +3 -0
index 34ec85f..1b3b2f5 100644
@@ -3,6 +3,8 @@ config BR2_PACKAGE_GST1_VALIDATE
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	select BR2_PACKAGE_PYTHON_PYEXPAT
+	# if package cairo is autodetected PNG support is needed
+	select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO
 	help
 	  GstValidate is a tool that allows GStreamer developers to
 	  check that the GstElements they write behave the way they

@@ -12,3 +14,4 @@ config BR2_PACKAGE_GST1_VALIDATE
 
 comment "gst1-validate depends on python"
 	depends on !BR2_PACKAGE_PYTHON
+
package/gstreamer1/gst1-validate/gst1-validate.mk +6 -1
index b8b09da..a7d66be 100644
@@ -12,6 +12,11 @@ GST1_VALIDATE_LICENSE_FILES = COPYING
 
 GST1_VALIDATE_CONF_OPTS = --disable-sphinx-doc
 
-GST1_VALIDATE_DEPENDENCIES = gstreamer1 gst1-plugins-base host-python python
+GST1_VALIDATE_DEPENDENCIES = \
+	gstreamer1 \
+	gst1-plugins-base \
+	host-python \
+	python \
+	$(if $(BR2_PACKAGE_CAIRO),cairo)
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 gst1-validate: fix compile with cairo support

Quoted 24 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

In case cairo support is (auto-)detected cairo PNG support is required.

Fixes ([1]):

../gst-libs/gst/video/.libs/libgstvalidatevideo-1.0.so: undefined reference to cairo_surface_write_to_png' ../gst-libs/gst/video/.libs/libgstvalidatevideo-1.0.so: undefined reference to cairo_image_surface_create_from_png'
collect2: error: ld returned 1 exit status

[1] http://autobuild.buildroot.net/results/c5e/c5eb6cb12dba559226c67f5d258cc151aa8a8d3a

Signed-off-by Peter Seiderer <[email protected]>
---
 package/gstreamer1/gst1-validate/Config.in        | 3 +++
 package/gstreamer1/gst1-validate/gst1-validate.mk | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-validate/Config.in +0 -0
index 34ec85f..1b3b2f5 100644

package/gstreamer1/gst1-validate/Config.in config BR2_PACKAGE_GST1_VALIDATE · line 7

Quoted 5 lines
package/gstreamer1/gst1-validate/Config.in +2 -0
@@ -3,6 +3,8 @@ config BR2_PACKAGE_GST1_VALIDATE
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	select BR2_PACKAGE_PYTHON_PYEXPAT
+	# if package cairo is autodetected PNG support is needed
+	select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO

I've reworded this slightly.

package/gstreamer1/gst1-validate/Config.in config BR2_PACKAGE_GST1_VALIDATE · line 17

Quoted 8 lines
package/gstreamer1/gst1-validate/Config.in +1 -0
 	help
 	  GstValidate is a tool that allows GStreamer developers to
 	  check that the GstElements they write behave the way they

@@ -12,3 +14,4 @@ config BR2_PACKAGE_GST1_VALIDATE
 
 comment "gst1-validate depends on python"
 	depends on !BR2_PACKAGE_PYTHON
+

And dropped this extra line. Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard