From: Bernd Kuhls Date: Tue, 1 May 2018 07:10:17 +0000 (+0200) Subject: package/mplayer: remove package X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dacb17650d81d37d5d821ac385fd84bbc6d03d09;p=buildroot.git package/mplayer: remove package 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 Signed-off-by: Thomas Petazzoni --- diff --git a/Config.in.legacy b/Config.in.legacy index 2b03ba7324..66d3a0c5a8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -156,6 +156,24 @@ 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_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 diff --git a/DEVELOPERS b/DEVELOPERS index 3ddb292894..b910a86a8c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -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/ diff --git a/package/Config.in b/package/Config.in index a48abf9470..ecee4938c9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -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" diff --git a/package/mplayer/0001-disable-install-strip.patch b/package/mplayer/0001-disable-install-strip.patch deleted file mode 100644 index 1bd1dc00ae..0000000000 --- a/package/mplayer/0001-disable-install-strip.patch +++ /dev/null @@ -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 -Signed-off-by: Vicente Olivert Riera - -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" diff --git a/package/mplayer/0002-mpdemux-live555-async-interface.patch b/package/mplayer/0002-mpdemux-live555-async-interface.patch deleted file mode 100644 index 5a62a18710..0000000000 --- a/package/mplayer/0002-mpdemux-live555-async-interface.patch +++ /dev/null @@ -1,126 +0,0 @@ -From d3195ea13f4a9aae546ff996e53681349a1a3cdb Mon Sep 17 00:00:00 2001 -From: sherpya -Date: Fri, 14 Jun 2013 05:25:38 +0200 -Subject: [PATCH 25/27] mpdemux: live555 async interface - -From: https://raw.github.com/sherpya/mplayer-be/master/patches/mp/0025-mpdemux-live555-async-interface.patch - -Adjust live555 interface code for modern versions of live555. - -Signed-off-by: Peter Korsgaard ---- - libmpdemux/demux_rtp.cpp | 51 ++++++++++++++++++++++++++++++++---------------- - 2 files changed, 35 insertions(+), 22 deletions(-) - -diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp -index ad7a7f1..05d06e0 100644 ---- a/libmpdemux/demux_rtp.cpp -+++ b/libmpdemux/demux_rtp.cpp -@@ -19,8 +19,6 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 -- - extern "C" { - // on MinGW, we must include windows.h before the things it conflicts - #ifdef __MINGW32__ // with. they are each protected from -@@ -94,15 +92,6 @@ struct RTPState { - - extern "C" char* network_username; - extern "C" char* network_password; --static char* openURL_rtsp(RTSPClient* client, char const* url) { -- // If we were given a user name (and optional password), then use them: -- if (network_username != NULL) { -- char const* password = network_password == NULL ? "" : network_password; -- return client->describeWithPassword(url, network_username, password); -- } else { -- return client->describeURL(url); -- } --} - - static char* openURL_sip(SIPClient* client, char const* url) { - // If we were given a user name (and optional password), then use them: -@@ -118,6 +107,19 @@ static char* openURL_sip(SIPClient* client, char const* url) { - extern AVCodecContext *avcctx; - #endif - -+static char fWatchVariableForSyncInterface; -+static char* fResultString; -+static int fResultCode; -+ -+static void responseHandlerForSyncInterface(RTSPClient* rtspClient, int responseCode, char* responseString) { -+ // Set result values: -+ fResultCode = responseCode; -+ fResultString = responseString; -+ -+ // Signal a break from the event loop (thereby returning from the blocking command): -+ fWatchVariableForSyncInterface = ~0; -+} -+ - extern "C" int audio_id, video_id, dvdsub_id; - extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - Boolean success = False; -@@ -146,13 +148,19 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - rtsp_transport_http = demuxer->stream->streaming_ctrl->url->port; - rtsp_transport_tcp = 1; - } -- rtspClient = RTSPClient::createNew(*env, verbose, "MPlayer", rtsp_transport_http); -+ rtspClient = RTSPClient::createNew(*env, url, verbose, "MPlayer", rtsp_transport_http); - if (rtspClient == NULL) { - fprintf(stderr, "Failed to create RTSP client: %s\n", - env->getResultMsg()); - break; - } -- sdpDescription = openURL_rtsp(rtspClient, url); -+ fWatchVariableForSyncInterface = 0; -+ rtspClient->sendDescribeCommand(responseHandlerForSyncInterface); -+ env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface); -+ if (fResultCode == 0) -+ sdpDescription = fResultString; -+ else -+ delete[] fResultString; - } else { // SIP - unsigned char desiredAudioType = 0; // PCMU (use 3 for GSM) - sipClient = SIPClient::createNew(*env, desiredAudioType, NULL, -@@ -236,8 +244,12 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - - if (rtspClient != NULL) { - // Issue a RTSP "SETUP" command on the chosen subsession: -- if (!rtspClient->setupMediaSubsession(*subsession, False, -- rtsp_transport_tcp)) break; -+ fWatchVariableForSyncInterface = 0; -+ rtspClient->sendSetupCommand(*subsession, responseHandlerForSyncInterface, False, rtsp_transport_tcp); -+ env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface); -+ delete[] fResultString; -+ if (fResultCode != 0) break; -+ - if (!strcmp(subsession->mediumName(), "audio")) - audiofound = 1; - if (!strcmp(subsession->mediumName(), "video")) -@@ -248,7 +260,11 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - - if (rtspClient != NULL) { - // Issue a RTSP aggregate "PLAY" command on the whole session: -- if (!rtspClient->playMediaSession(*mediaSession)) break; -+ fWatchVariableForSyncInterface = 0; -+ rtspClient->sendPlayCommand(*mediaSession, responseHandlerForSyncInterface); -+ env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface); -+ delete[] fResultString; -+ if (fResultCode != 0) break; - } else if (sipClient != NULL) { - sipClient->sendACK(); // to start the stream flowing - } -@@ -637,7 +653,8 @@ static void teardownRTSPorSIPSession(RTPState* rtpState) { - MediaSession* mediaSession = rtpState->mediaSession; - if (mediaSession == NULL) return; - if (rtpState->rtspClient != NULL) { -- rtpState->rtspClient->teardownMediaSession(*mediaSession); -+ fWatchVariableForSyncInterface = 0; -+ rtpState->rtspClient->sendTeardownCommand(*mediaSession, NULL); - } else if (rtpState->sipClient != NULL) { - rtpState->sipClient->sendBYE(); - } --- -1.8.5.2 - diff --git a/package/mplayer/0003-configure-armv8.patch b/package/mplayer/0003-configure-armv8.patch deleted file mode 100644 index 98686433fb..0000000000 --- a/package/mplayer/0003-configure-armv8.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix aarch64 compile by adding HAVE_ARMV8 define - -Fixes build errors seen on the buildroot autobuilders: -http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/build-end.log - -libavutil/aarch64/cpu.c: In function 'ff_get_cpu_flags_aarch64': -libavutil/aarch64/cpu.c:25:32: error: 'HAVE_ARMV8' undeclared (first use in this function) - return AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 | - -Signed-off-by: Bernd Kuhls -(patch sent upstream: - http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073496.html) - -Index: configure -=================================================================== ---- a/configure (revision 37871) -+++ b/configure (working copy) -@@ -1445,6 +1445,8 @@ - --disable-armv6) _armv6=no ;; - --enable-armv6t2) _armv6t2=yes ;; - --disable-armv6t2) _armv6t2=no ;; -+ --enable-armv8) _armv8=yes ;; -+ --disable-armv8) _armv8=no ;; - --enable-armvfp) _armvfp=yes ;; - --disable-armvfp) _armvfp=no ;; - --enable-vfpv3) vfpv3=yes ;; -@@ -3261,7 +3263,7 @@ - echores "$_iwmmxt" - fi - --cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' -+cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' - test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" - test "$_mmx" = yes && cpuexts="MMX $cpuexts" - test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" -@@ -3285,6 +3287,7 @@ - test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts" - test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts" - test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts" -+test "$_armv8" = yes && cpuexts="ARMV8 $cpuexts" - test "$_armvfp" = yes && cpuexts="VFP $cpuexts" - test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts" - test "$setend" = yes && cpuexts="SETEND $cpuexts" diff --git a/package/mplayer/0004-configure-zlib.patch b/package/mplayer/0004-configure-zlib.patch deleted file mode 100644 index 7c1b2c8ec0..0000000000 --- a/package/mplayer/0004-configure-zlib.patch +++ /dev/null @@ -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 - -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" - diff --git a/package/mplayer/0005-tremor-ogg.patch b/package/mplayer/0005-tremor-ogg.patch deleted file mode 100644 index b4d65052a3..0000000000 --- a/package/mplayer/0005-tremor-ogg.patch +++ /dev/null @@ -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 -(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' diff --git a/package/mplayer/0006-musl-ldt.patch b/package/mplayer/0006-musl-ldt.patch deleted file mode 100644 index 8165f6f56a..0000000000 --- a/package/mplayer/0006-musl-ldt.patch +++ /dev/null @@ -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 - -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__) diff --git a/package/mplayer/0007-fixmmx.patch b/package/mplayer/0007-fixmmx.patch deleted file mode 100644 index 9634a3b667..0000000000 --- a/package/mplayer/0007-fixmmx.patch +++ /dev/null @@ -1,77 +0,0 @@ -fix compilation failure with MMX - -Fixes -libmpcodecs/vf_fspp.c: In function 'column_fidct_c': -libmpcodecs/vf_fspp.c:750:5: error: unknown type name 'int_simd16_t' -libmpcodecs/vf_fspp.c:751:5: error: unknown type name 'int_simd16_t' -libmpcodecs/vf_fspp.c:752:5: error: unknown type name 'int_simd16_t' -libmpcodecs/vf_fspp.c:753:5: error: unknown type name 'int_simd16_t' -libmpcodecs/vf_fspp.c:789:18: error: 'FIX_0_707106781' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:789:18: note: each undeclared identifier is reported only once for each function it appears in -libmpcodecs/vf_fspp.c:804:21: error: 'FIX_1_414213562_A' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:817:18: error: 'FIX_0_382683433' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:818:18: error: 'FIX_0_541196100' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:819:18: error: 'FIX_1_306562965' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:844:21: error: 'FIX_1_414213562' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:845:21: error: 'FIX_1_847759065' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:846:21: error: 'FIX_1_082392200' undeclared (first use in this function) -libmpcodecs/vf_fspp.c:847:21: error: 'FIX_2_613125930' undeclared (first use in this function) - -found using this defconfig after fixing the original bug: -http://autobuild.buildroot.net/results/642/6422adeef19ec547c7bc3f8ad3b0d51702015240/ - -Downloaded from upstream mailinglist: -http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073488.html - -Signed-off-by: Bernd Kuhls - -diff -uNr MPlayer-1.3.0.org/libmpcodecs/vf_fspp.c MPlayer-1.3.0/libmpcodecs/vf_fspp.c ---- MPlayer-1.3.0.org/libmpcodecs/vf_fspp.c 2015-10-17 21:44:31.000000000 +0200 -+++ MPlayer-1.3.0/libmpcodecs/vf_fspp.c 2017-04-10 21:26:57.771819064 +0200 -@@ -173,7 +173,6 @@ - #define store_slice_s store_slice_c - #define store_slice2_s store_slice2_c - #define mul_thrmat_s mul_thrmat_c --#define column_fidct_s column_fidct_c - #define row_idct_s row_idct_c - #define row_fdct_s row_fdct_c - -@@ -393,7 +392,6 @@ - ); - } - --static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); - static void row_idct_mmx(int16_t* workspace, - int16_t* output_adr, int output_stride, int cnt); - static void row_fdct_mmx(int16_t *data, const uint8_t *pixels, int line_size, int cnt); -@@ -401,11 +399,18 @@ - #define store_slice_s store_slice_mmx - #define store_slice2_s store_slice2_mmx - #define mul_thrmat_s mul_thrmat_mmx --#define column_fidct_s column_fidct_mmx - #define row_idct_s row_idct_mmx - #define row_fdct_s row_fdct_mmx - #endif // HAVE_MMX_INLINE - -+#if !HAVE_MMXEXT_INLINE -+static void column_fidct_c(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); -+#define column_fidct_s column_fidct_c -+#else -+static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); -+#define column_fidct_s column_fidct_mmx -+#endif -+ - static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, - int dst_stride, int src_stride, - int width, int height, -@@ -728,7 +733,9 @@ - DECLARE_ASM_CONST(8, uint64_t, MM_DESCALE_RND)=C64(4); - DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64(2); - --#else /* !HAVE_MMXEXT_INLINE */ -+#endif /* !HAVE_MMX_INLINE */ -+ -+#if !HAVE_MMX_INLINE || !HAVE_MMXEXT_INLINE - - typedef int32_t int_simd16_t; - static const int16_t FIX_0_382683433=FIX(0.382683433, 14); diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in deleted file mode 100644 index 4db1551ed4..0000000000 --- a/package/mplayer/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - bool - default y - # Those architectures are not supported by MPlayer - depends on !(BR2_sh2a || BR2_sh4a || BR2_sh4aeb \ - || BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k) - # Broken support for