summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-05-01 09:10:14 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-08 15:40:28 +0200
commit3f44911971f7ceecbcc3371806c970e93a10a3f9 (patch)
tree4dd90961673693ef3ac428d43ca6913090267772
parent6ac12d8b18b4e1ebd8b11279e98068d2b3ba449e (diff)
downloadbuildroot-3f44911971f7ceecbcc3371806c970e93a10a3f9.tar.gz
buildroot-3f44911971f7ceecbcc3371806c970e93a10a3f9.zip
package/libplayer: remove mplayer support
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--Config.in.legacy6
-rw-r--r--package/libplayer/Config.in5
-rw-r--r--package/libplayer/libplayer.mk8
3 files changed, 7 insertions, 12 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index c51984a3b9..2b03ba7324 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -156,6 +156,12 @@ config BR2_PACKAGE_LIBKCAPI_APPS
Test applications (hasher, rng read, speed-test, test) now
have their own configuration options in the libkcapi menu.
+config BR2_PACKAGE_LIBPLAYER_MPLAYER
+ bool "mplayer support in libplayer removed"
+ select BR2_LEGACY
+ help
+ The mplayer package was removed.
+
config BR2_PACKAGE_IQVLINUX
bool "iqvlinux package removed"
select BR2_LEGACY
diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index 82083a0eea..3cad683248 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -9,11 +9,6 @@ config BR2_PACKAGE_LIBPLAYER
http://libplayer.geexbox.org/
if BR2_PACKAGE_LIBPLAYER
-config BR2_PACKAGE_LIBPLAYER_MPLAYER
- bool "mplayer backend"
- depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer
- select BR2_PACKAGE_MPLAYER
config BR2_PACKAGE_LIBPLAYER_GSTREAMER
bool "gstreamer backend"
diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
index f4eccedb06..8d139cea0e 100644
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -20,18 +20,12 @@ define LIBPLAYER_CONFIGURE_CMDS
./configure \
--prefix=/usr \
--cross-compile \
+ --disable-mplayer \
$(SHARED_STATIC_LIBS_OPTS) \
$(LIBPLAYER_CONF_OPTS) \
)
endef
-ifeq ($(BR2_PACKAGE_LIBPLAYER_MPLAYER),y)
-LIBPLAYER_DEPENDENCIES += mplayer
-LIBPLAYER_CONF_OPTS += --enable-mplayer
-else
-LIBPLAYER_CONF_OPTS += --disable-mplayer
-endif
-
ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y)
LIBPLAYER_DEPENDENCIES += gstreamer
LIBPLAYER_CONF_OPTS += --enable-gstreamer
OpenPOWER on IntegriCloud