package/libplayer: remove mplayer support

PATCH New Bernd Kuhls 2 participants 6 messages May 1, 2018 – May 9, 2018

lore

Share & tools

lore

Bernd Kuhls

author

2018-05-01 07:10 UTC #0 lore raw

PATCH 1/4 package/libplayer: remove mplayer support

Signed-off-by Bernd Kuhls <[email protected]>

---
 Config.in.legacy               | 6 ++++++
 package/libplayer/Config.in    | 5 -----
 package/libplayer/libplayer.mk | 8 +-------
 3 files changed, 7 insertions(+), 12 deletions(-)

Config.in.legacy +6 -0

index 3d8b28c5fe..e6b33db199 100644
@@ -145,6 +145,12 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+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

package/libplayer/Config.in +0 -5

index 82083a0eea..3cad683248 100644
@@ -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"

package/libplayer/libplayer.mk +1 -7

index f4eccedb06..8d139cea0e 100644
@@ -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

Signature · 1 line

2.14.2

Bernd Kuhls

author

2018-05-01 07:10 UTC #1 lore raw

PATCH 2/4 package/tovid: bump version

Support for mpv is not present in the tarball version 0.35.2, therefore we bump this package to current git master branch to prepare the switch from mplayer to mpv.

Added license hash.

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tovid/tovid.hash | 3 ++-
 package/tovid/tovid.mk   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

package/tovid/tovid.hash +2 -1

index 0bd7668fad..89d0461a98 100644
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 3193d081a7aa8e00f946b7514066f1fb7647f533ab1ebcc36b5ced927b0a1ab5  tovid-0.35.2.tar.gz
+sha256 c03a746a3592a656bab0be4045da114a4231eb0f858d6c18503dac64049fbe48  tovid-87c676f4aadb7303d2cd921380b054bafa4b85bb.tar.gz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING

package/tovid/tovid.mk +2 -2

index c904b981f6..4c5c60aa7f 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-TOVID_VERSION = 0.35.2
-TOVID_SITE = https://github.com/tovid-suite/tovid/releases/download/$(TOVID_VERSION)
+TOVID_VERSION = 87c676f4aadb7303d2cd921380b054bafa4b85bb
+TOVID_SITE = $(call github,tovid-suite,tovid,$(TOVID_VERSION))
 TOVID_LICENSE = GPL-2.0+
 TOVID_LICENSE_FILES = COPYING
 TOVID_SETUP_TYPE = distutils

Signature · 1 line

2.14.2

Bernd Kuhls

author

2018-05-01 07:10 UTC #2 lore raw

PATCH 3/4 package/tovid: switch from mplayer to mpv

In reply to Bernd Kuhls

The mplayer package will be removed from buildroot, tovid can use mpv instead. Support for mpv was added upstream:
https://github.com/tovid-suite/tovid/commit/05cbce2ea130e50f6bf1599816dd0d7bf3ace91a

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tovid/Config.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

package/tovid/Config.in +11 -6

index d8052ea334..0d42785e8a 100644
@@ -6,8 +6,9 @@ config BR2_PACKAGE_TOVID
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # mpv
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 # mpv
+	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC # mpv
 	# The below dependencies are runtime dependencies only
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng
 	select BR2_PACKAGE_DVDAUTHOR

@@ -16,7 +17,7 @@ config BR2_PACKAGE_TOVID
 	select BR2_PACKAGE_IMAGEMAGICK
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_MJPEGTOOLS
-	select BR2_PACKAGE_MPLAYER
+	select BR2_PACKAGE_MPV
 	select BR2_PACKAGE_PROCPS_NG # pgrep and pkill
 	select BR2_PACKAGE_SOX
 	help

@@ -30,13 +31,17 @@ config BR2_PACKAGE_TOVID
 comment "tovid needs a toolchain w/ threads, C++, wchar"
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
 	depends on !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 \
 		|| !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_USE_WCHAR
+	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
 
 comment "tovid depends on python or python3"
 	depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC

Signature · 1 line

2.14.2

Thomas Petazzoni

2018-05-09 19:37 UTC #3 lore raw

PATCH 3/4 package/tovid: switch from mplayer to mpv

Hello,

Quoted 35 lines · Bernd Kuhls

The mplayer package will be removed from buildroot, tovid can use mpv instead. Support for mpv was added upstream:
https://github.com/tovid-suite/tovid/commit/05cbce2ea130e50f6bf1599816dd0d7bf3ace91a

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tovid/Config.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

package/tovid/Config.in +4 -3

index d8052ea334..0d42785e8a 100644
@@ -6,8 +6,9 @@ config BR2_PACKAGE_TOVID
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # mpv
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 # mpv
+	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC # mpv
 	# The below dependencies are runtime dependencies only
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng
 	select BR2_PACKAGE_DVDAUTHOR

@@ -16,7 +17,7 @@ config BR2_PACKAGE_TOVID
 	select BR2_PACKAGE_IMAGEMAGICK
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_MJPEGTOOLS
-	select BR2_PACKAGE_MPLAYER
+	select BR2_PACKAGE_MPV
 	select BR2_PACKAGE_PROCPS_NG # pgrep and pkill
 	select BR2_PACKAGE_SOX
 	help

package/tovid/Config.in config BR2_PACKAGE_TOVID · line 31

Quoted 1 line

package/tovid/Config.in +0 -0

@@ -30,13 +31,17 @@ config BR2_PACKAGE_TOVID
 comment "tovid needs a toolchain w/ threads, C++, wchar"

You forgot to update this comment...

package/tovid/Config.in config BR2_PACKAGE_TOVID · line 36

Quoted 7 lines

package/tovid/Config.in +2 -2

 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
 	depends on !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 \

... with the addition of the gcc 4.5 dependency, so I fixed that before applying.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Bernd Kuhls

author

2018-05-01 07:10 UTC #4 lore raw

PATCH 4/4 package/mplayer: remove package

In reply to Bernd Kuhls

This package causes numerous build errors. During the last hackaton it was decided to remove this package:
http://lists.busybox.net/pipermail/buildroot/2018-April/217514.html

Fixes
http://autobuild.buildroot.net/results/bda/bda461391c9e02e313fda887b75099e619527a7a/

Signed-off-by Bernd Kuhls <[email protected]>

---
 Config.in.legacy                                   |  18 +
 DEVELOPERS                                         |   1 -
 package/Config.in                                  |   1 -
 package/mplayer/0001-disable-install-strip.patch   |  23 --
 .../0002-mpdemux-live555-async-interface.patch     | 126 -------
 package/mplayer/0003-configure-armv8.patch         |  43 ---
 package/mplayer/0004-configure-zlib.patch          |  30 --
 package/mplayer/0005-tremor-ogg.patch              |  29 --
 package/mplayer/0006-musl-ldt.patch                |  22 --
 package/mplayer/0007-fixmmx.patch                  |  77 ----
 package/mplayer/Config.in                          |  42 ---
 package/mplayer/mplayer.hash                       |   4 -
 package/mplayer/mplayer.mk                         | 391 ---------------------
 13 files changed, 18 insertions(+), 789 deletions(-)
 delete mode 100644 package/mplayer/0001-disable-install-strip.patch
 delete mode 100644 package/mplayer/0002-mpdemux-live555-async-interface.patch
 delete mode 100644 package/mplayer/0003-configure-armv8.patch
 delete mode 100644 package/mplayer/0004-configure-zlib.patch
 delete mode 100644 package/mplayer/0005-tremor-ogg.patch
 delete mode 100644 package/mplayer/0006-musl-ldt.patch
 delete mode 100644 package/mplayer/0007-fixmmx.patch
 delete mode 100644 package/mplayer/Config.in
 delete mode 100644 package/mplayer/mplayer.hash
 delete mode 100644 package/mplayer/mplayer.mk

Config.in.legacy +18 -0

index e6b33db199..09ded814a0 100644
@@ -145,6 +145,24 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_MPLAYER
+	bool "mplayer package removed"
+	select BR2_LEGACY
+	help
+	  The mplayer package was removed.
+
+config BR2_PACKAGE_MPLAYER_MPLAYER
+	bool "mplayer package removed"
+	select BR2_LEGACY
+	help
+	  The mplayer package was removed.
+
+config BR2_PACKAGE_MPLAYER_MENCODER
+	bool "mplayer package removed"
+	select BR2_LEGACY
+	help
+	  The mplayer package was removed.
+
 config BR2_PACKAGE_LIBPLAYER_MPLAYER
 	bool "mplayer support in libplayer removed"
 	select BR2_LEGACY

DEVELOPERS +0 -1

index 8ef3a7c123..d036e32054 100644
@@ -321,7 +321,6 @@ F:	package/libyuv/
 F:	package/mesa3d/
 F:	package/minidlna/
 F:	package/mjpg-streamer/
-F:	package/mplayer/
 F:	package/perl-crypt-openssl-random/
 F:	package/perl-crypt-openssl-rsa/
 F:	package/perl-digest-sha1/

package/Config.in +0 -1

index d9762f17c1..0a4eed9df3 100644
@@ -37,7 +37,6 @@ menu "Audio and video applications"
 	source "package/mpd/Config.in"
 	source "package/mpd-mpc/Config.in"
 	source "package/mpg123/Config.in"
-	source "package/mplayer/Config.in"
 	source "package/mpv/Config.in"
 	source "package/multicat/Config.in"
 	source "package/musepack/Config.in"

package/mplayer/0001-disable-install-strip.patch deleted +0 ~~-23~~

deleted file mode 100644
index 1bd1dc00ae..0000000000
@@ -1,23 +0,0 @@
-Disable stripping on installation
-
-Using the -s option of install does not work, as it uses the host
-strip instead of the cross strip. So, get rid of it, and let Buildroot
-handle the stripping.
-
-[Vincent: tweak patch for version 1.2]
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Vicente Olivert Riera <[email protected]>
-
-diff -Nrua a/configure b/configure
---- a/configure	2015-10-02 21:29:04.000000000 +0100
-+++ b/configure	2015-10-06 13:28:37.245349592 +0100
-@@ -2780,7 +2780,7 @@
- 
- 
- # Checking for CFLAGS
--_install_strip="-s"
-+_install_strip=
- if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then
-   if test "$cc_vendor" = "intel" ; then
-     CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"

package/mplayer/0002-mpdemux-live555-async-interface.patch deleted +0 ~~-126~~

126 lines not on this page · raw message

package/mplayer/0003-configure-armv8.patch deleted +0 ~~-43~~

43 lines not on this page · raw message

package/mplayer/0004-configure-zlib.patch deleted +0 ~~-30~~

deleted file mode 100644
index 7c1b2c8ec0..0000000000
@@ -1,30 +0,0 @@
-configure: Fix compilation when zlib is missing.
-
-Downloaded from upstream commit:
-
-$ LC_ALL=C svn log -r 37816
-------------------------------------------------------------------------
-r37816 | reimar | 2016-02-28 14:39:42 +0100 (Sun, 28 Feb 2016) | 3 lines
-
-configure: Fix compilation when zlib is missing.
-
-APNG and a few other decoders also cannot be enabled without it.
-------------------------------------------------------------------------
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-Index: configure
-===================================================================
---- a/configure	(revision 37795)
-+++ b/configure	(revision 37816)
-@@ -6464,8 +6464,8 @@
-   mplayer_encoders="$mplayer_encoders PNG_ENCODER"
- else
-   def_zlib='#define CONFIG_ZLIB 0'
--  libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M TSCC ZEROCODEC')
--  libavencoders=$(filter_out_component encoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB')
-+  libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M RSCC SCREENPRESSO TDSC TSCC ZEROCODEC')
-+  libavencoders=$(filter_out_component encoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB')
- fi
- echores "$_zlib"
-

package/mplayer/0005-tremor-ogg.patch deleted +0 ~~-29~~

deleted file mode 100644
index b4d65052a3..0000000000
@@ -1,29 +0,0 @@
-Fix static linking with tremor & libogg
-
-The order of the libraries needs to be changed to fix a bug during
-static linking caught by buildroot autobuilders:
-
-http://autobuild.buildroot.net/results/bc9/bc98fa585399b53ea181dbaf392b93424145911d/
-
-/home/test/autobuild/instance-3/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(synthesis.o): In function `_vorbis_synthesis1':
-synthesis.c:(.text+0x90): undefined reference to `oggpack_readinit'
-synthesis.c:(.text+0x9c): undefined reference to `oggpack_read'
-[...]
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-(patch sent upstream:
- http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-July/073501.html)
-
-Index: configure
-===================================================================
---- a/configure	(revision 37873)
-+++ b/configure	(working copy)
-@@ -6629,7 +6629,7 @@
-   def_tremor='#define CONFIG_TREMOR 1'
-   codecmodules="tremor $codecmodules"
-   res_comment="integer libvorbis"
--  extra_ldflags="$extra_ldflags -logg -lvorbisidec"
-+  extra_ldflags="$extra_ldflags -lvorbisidec -logg"
- elif test "$_libvorbis" = yes ; then
-   _vorbis=yes
-   def_vorbis='#define CONFIG_OGGVORBIS 1'

package/mplayer/0006-musl-ldt.patch deleted +0 ~~-22~~

deleted file mode 100644
index 8165f6f56a..0000000000
@@ -1,22 +0,0 @@
-Fixes musl build error
-
-loader/ldt_keeper.o: In function `Setup_LDT_Keeper':
-ldt_keeper.c:(.text+0xab): undefined reference to `modify_ldt'
-
-Downloaded from
-https://github.com/dimkr/rlsd2/blob/master/rules/mplayer/musl.patch
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -rup MPlayer-1.1.1-orig/loader/ldt_keeper.c MPlayer-1.1.1/loader/ldt_keeper.c
---- MPlayer-1.1.1-orig/loader/ldt_keeper.c	2015-04-23 15:07:09.580805888 +0300
-+++ MPlayer-1.1.1/loader/ldt_keeper.c	2015-04-23 15:08:07.736807270 +0300
-@@ -47,7 +47,7 @@
- #if defined(__GLIBC__) &&  (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0))
- _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
- #else
--int modify_ldt(int func, void *ptr, unsigned long bytecount);
-+#define modify_ldt(func, ptr, bytecount) syscall(__NR_modify_ldt, func, ptr, bytecount)
- #endif
- #else
- #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)

package/mplayer/0007-fixmmx.patch deleted +0 ~~-77~~

77 lines not on this page · raw message

package/mplayer/Config.in deleted +0 ~~-42~~

42 lines not on this page · raw message

package/mplayer/mplayer.hash deleted +0 -4

deleted file mode 100644
index e6b8842253..0000000000
@@ -1,4 +0,0 @@
-# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz.md5
-md5 e8a4d77ad4f509e81dd5e13b51636c1d  MPlayer-1.3.0.tar.xz
-# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz.sha1
-sha1 11db20434a4e1aabb9c52f7712241dae1b3730e3  MPlayer-1.3.0.tar.xz

package/mplayer/mplayer.mk deleted +0 ~~-391~~

391 lines not on this page · raw message

Signature · 1 line

2.14.2

Thomas Petazzoni

2018-05-09 19:37 UTC #5 lore raw

PATCH 1/4 package/libplayer: remove mplayer support

In reply to Bernd Kuhls

Hello,

Quoted 6 lines · Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 Config.in.legacy               | 6 ++++++
 package/libplayer/Config.in    | 5 -----
 package/libplayer/libplayer.mk | 8 +-------
 3 files changed, 7 insertions(+), 12 deletions(-)

Series applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com