Commit fa561914 authored by Benoît Thébaudeau's avatar Benoît Thébaudeau Committed by Peter Korsgaard
Browse files

gst1-plugins-bad: remove obsolete make rules 



Commit 83e29f26 "gst1-plugins-bad: bump
version" (from 1.2.4 to 1.4.1) removed the configuration options for the
cdaudio and eglglessink plugins as a consequence of their removal in
1.3.1. However, that commit did not remove the corresponding make rules,
so remove them now.

Signed-off-by: default avatarBenoît Thébaudeau <benoit@wsystem.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ffce5350

package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk

+0 −24
Original line number Diff line number Diff line
@@ -544,13 +544,6 @@ else 
GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2

endif



ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO),y)

GST1_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio

GST1_PLUGINS_BAD_DEPENDENCIES += libcdaudio

else

GST1_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio

endif



ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y)

GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl

GST1_PLUGINS_BAD_DEPENDENCIES += libcurl
@@ -663,23 +656,6 @@ else 
GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg

endif



ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES),y)

GST1_PLUGINS_BAD_CONF_OPTS += --enable-eglgles

GST1_PLUGINS_BAD_DEPENDENCIES += libegl libgles



ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)

# RPI has odd locations for several required headers.

GST1_PLUGINS_BAD_CONF_OPTS += --with-egl-window-system=rpi

GST1_PLUGINS_BAD_CONF_ENV += \

	CFLAGS="$(TARGET_CFLAGS) \

	-I$(STAGING_DIR)/usr/include/IL \

	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \

	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"

endif

else

GST1_PLUGINS_BAD_CONF_OPTS += --disable-eglgles

endif



ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y)

GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config

GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdl