From bf8203de71dfaf228cfbe5fa8db5157d7a269285 Mon Sep 17 00:00:00 2001 From: Daniel Laird Date: Fri, 23 Jan 2009 10:39:35 +0000 Subject: gst-plugins-good: Fix style issues and use of --disable-png. Update ordering and configure options. Signed-off-by: Daniel Laird --- .../gst-plugins-good/gst-plugins-good.mk | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk index 5c6beac98..d1dc763ee 100644 --- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk +++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk @@ -27,6 +27,20 @@ GST_PLUGINS_GOOD_CONF_OPT = \ GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base +ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) +GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg +GST_PLUGINS_GOOD_DEPENDENCIES += jpeg +else +GST_PLUGINS_GOOD_CONF_OPT += --disable-jpeg +endif + +ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y) +GST_PLUGINS_GOOD_CONF_OPT += --enable-libpng +GST_PLUGINS_GOOD_DEPENDENCIES += libpng +else +GST_PLUGINS_GOOD_CONF_OPT += --disable-libpng +endif + ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y) GST_PLUGINS_GOOD_CONF_OPT += --enable-bz2 GST_PLUGINS_GOOD_DEPENDENCIES += bzip2 @@ -41,20 +55,6 @@ else GST_PLUGINS_GOOD_CONF_OPT += --disable-zlib endif -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) -GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg -GST_PLUGINS_GOOD_DEPENDENCIES += jpeg -else -GST_PLUGINS_GOOD_CONF_OPT += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y) -GST_PLUGINS_GOOD_CONF_OPT += --enable-png -GST_PLUGINS_GOOD_DEPENDENCIES += libpng -else -GST_PLUGINS_GOOD_CONF_OPT += --disable-png -endif - ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter else -- cgit v1.2.3