From ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Apr 2017 11:04:51 +0200 Subject: recipes: remove blacklisted recipes * as PNBLACKLIST message says, these recipes are blacklisted for long time and nobody showed any interest to fix them * remove all unused .patch and .inc files as well Signed-off-by: Martin Jansa --- meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39 ----- .../recipes-multimedia/minidlna/minidlna_1.1.5.bb | 6 - ...on-t-disable-ASS-support-when-explicitly-.patch | 26 ---- ...artially-port-libtheora-glue-code-to-Theo.patch | 136 ------------------ meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 159 --------------------- 5 files changed, 366 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc delete mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb delete mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch delete mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch delete mode 100644 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb (limited to 'meta-oe/recipes-multimedia') diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc b/meta-oe/recipes-multimedia/minidlna/minidlna.inc deleted file mode 100644 index b333fce0bb..0000000000 --- a/meta-oe/recipes-multimedia/minidlna/minidlna.inc +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ -being fully compliant with DLNA/UPnP-AV clients." -LICENSE = "GPL-2.0|BSD" -DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" - -# because it depends on libav which has commercial flag -LICENSE_FLAGS = "commercial" - -inherit gettext autotools-brokensep update-rc.d systemd - -SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ - file://minidlna-daemon.init.d \ - file://minidlna.service " - -S = "${WORKDIR}/git" - -# This remove "--exclude=autopoint" option from autoreconf argument to avoid -# configure.ac:30: error: required file './ABOUT-NLS' not found -EXTRA_AUTORECONF = "" - -do_install_append(){ - install -d ${D}${sysconfdir} - install -m 0755 minidlna.conf ${D}${sysconfdir} - -# Systemd script - install -d ${D}${nonarch_base_libdir}/systemd/system - install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system - -# Sysvinit script - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna - -} - -SYSTEMD_SERVICE_${PN} = "minidlna.service" - -INITSCRIPT_NAME = "minidlna" -INITSCRIPT_PARAMS = "defaults 90" - diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb deleted file mode 100644 index 81d700a7b1..0000000000 --- a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc - -SRCREV = "v1_1_5" -LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" - -PNBLACKLIST[minidlna] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130630/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch deleted file mode 100644 index e232595cd9..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 27 Mar 2014 00:08:54 +0100 -Subject: [PATCH] configure: don't disable ASS support when explicitly enabled - -Signed-off-by: Martin Jansa ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 60fd308..2f7df3b 100755 ---- a/configure -+++ b/configure -@@ -4346,7 +4346,7 @@ fi - - - echocheck "SSA/ASS support" --if test "$_ass" = auto ; then -+if test "$_ass" = auto -o "$_ass" = yes ; then - if pkg_config_add libass ; then - _ass=yes - def_ass='#define CONFIG_ASS 1' --- -1.9.1 - diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch deleted file mode 100644 index b4d98412f2..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 0571bb4f1a6e1934ee7e093ce7aa517b9bac8e6a Mon Sep 17 00:00:00 2001 -From: Awais Belal -Date: Sun, 17 Jan 2016 14:46:10 +0500 -Subject: [PATCH] demux_ogg: partially port libtheora glue code to Theora 1.0 - API - -This partially backports the following commit to allow building -with gcc-5.x and otherwise fails to find the definition of -the _ilog function the way it is used. - -https://github.com/pigoz/mplayer-svn/commit/85e51408cd00979fc209da8e3a39b6f0e7f325bc - -Signed-off-by: Awais Belal ---- - libmpdemux/demux_ogg.c | 52 ++++++++++++++++++++++++++------------------------ - 1 file changed, 27 insertions(+), 25 deletions(-) - -diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c -index 9eea061..9144426 100644 ---- a/libmpdemux/demux_ogg.c -+++ b/libmpdemux/demux_ogg.c -@@ -50,8 +50,7 @@ - #endif - - #ifdef CONFIG_OGGTHEORA --#include --int _ilog (unsigned int); /* defined in many places in theora/lib/ */ -+#include - #endif - - #define BLOCK_SIZE 4096 -@@ -62,9 +61,10 @@ int _ilog (unsigned int); /* defined in many places in theora/lib/ */ - */ - #ifdef CONFIG_OGGTHEORA - typedef struct theora_struct_st { -- theora_state st; -- theora_comment cc; -- theora_info inf; -+ th_setup_info *tsi; -+ th_dec_ctx *tctx; -+ th_comment tc; -+ th_info ti; - } theora_struct_t; - #endif - -@@ -117,7 +117,7 @@ typedef struct ogg_stream { - float samplerate; /// granulpos 2 time - int64_t lastpos; - int32_t lastsize; -- int keyframe_frequency_force; -+ int keyframe_granule_shift; - - // Logical stream state - ogg_stream_state stream; -@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_packet(ogg_stream_t *os, ogg_packet *pack, - have theora_state st, until all header packets were passed to the - decoder. */ - if (!pack->bytes || !(*data&0x80)) { -- int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1); -- int64_t iframemask = (1 << keyframe_granule_shift) - 1; -+ int64_t iframemask = iframemask = (1 << os->keyframe_granule_shift) - 1; - - if (pack->granulepos >= 0) { -- os->lastpos = pack->granulepos >> keyframe_granule_shift; -+ os->lastpos = pack->granulepos >> os->keyframe_granule_shift; - os->lastpos += pack->granulepos & iframemask; - *keyframe = (pack->granulepos & iframemask) == 0; - } else { -@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer) - #ifdef CONFIG_OGGTHEORA - } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { - int errorCode = 0; -- theora_info inf; -- theora_comment cc; -+ th_info ti; -+ th_comment tc; -+ th_setup_info *tsi = NULL; - -- theora_info_init (&inf); -- theora_comment_init (&cc); -+ th_info_init (&ti); -+ th_comment_init (&tc); - -- errorCode = theora_decode_header (&inf, &cc, &pack); -- if (errorCode) { -+ errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack); -+ if (errorCode < 0) { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "Theora header parsing failed: %i \n", errorCode); - } else { -@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer) - sh_v->bih = calloc(1, sizeof(*sh_v->bih)); - sh_v->bih->biSize = sizeof(*sh_v->bih); - sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA; -- sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator; -- sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator; -- sh_v->disp_w = sh_v->bih->biWidth = inf.frame_width; -- sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height; -+ sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator; -+ sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator; -+ sh_v->i_bps = ti.target_bitrate / 8; -+ sh_v->disp_w = sh_v->bih->biWidth = ti.frame_width; -+ sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height; - sh_v->bih->biBitCount = 24; - sh_v->bih->biPlanes = 3; - sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight); - ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps; - ogg_d->subs[ogg_d->num_sub].theora = 1; -- ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force; -+ ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift = ti.keyframe_granule_shift; - ogg_d->subs[ogg_d->num_sub].id = n_video; - n_video++; - mp_msg(MSGT_DEMUX, MSGL_INFO, - "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n", - ogg_d->num_sub, -- (int)inf.version_major, -- (int)inf.version_minor, -- (int)inf.version_subminor, -+ (int)ti.version_major, -+ (int)ti.version_minor, -+ (int)ti.version_subminor, - n_video - 1); - if (mp_msg_test(MSGT_HEADER, MSGL_V)) - print_video_header(sh_v->bih, MSGL_V); - } -- theora_comment_clear(&cc); -- theora_info_clear(&inf); -+ th_comment_clear(&tc); -+ th_info_clear(&ti); -+ th_setup_free(tsi); - #endif /* CONFIG_OGGTHEORA */ - } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) { - sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio); --- -1.9.1 - diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb deleted file mode 100644 index 1a4ae27e61..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ /dev/null @@ -1,159 +0,0 @@ -SUMMARY = "Open Source multimedia player" -SECTION = "multimedia" -HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ - libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ - libxv virtual/libx11 libass speex faad2 libxscrnsaver" - -RDEPENDS_${PN} = "mplayer-common" -PROVIDES = "mplayer" -RPROVIDES_${PN} = "mplayer" -RCONFLICTS_${PN} = "mplayer" - -# Depends on xsp, libxv, virtual/libx11, libxscrnsaver -REQUIRED_DISTRO_FEATURES = "x11" - -# because it depends on libpostproc/libav which has commercial flag -LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "git://repo.or.cz/mplayer.git \ - file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \ - file://0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch \ -" - -SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9" - -ARM_INSTRUCTION_SET = "arm" - -PV = "2.0+gitr${SRCPV}" -PR = "r13" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/git" - -FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/" -CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ - /usr/etc/mplayer/example.conf \ - /usr/etc/mplayer/codecs.conf \ -" - -inherit autotools-brokensep pkgconfig python3native - -EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ - --target=${SIMPLE_TARGET_SYS} \ - \ - --disable-lirc \ - --disable-lircc \ - --disable-joystick \ - --disable-vm \ - --disable-xf86keysym \ - --enable-tv \ - --enable-tv-v4l2 \ - --disable-tv-bsdbt848 \ - --enable-rtc \ - --enable-networking \ - --disable-smb \ - --disable-dvdnav \ - --enable-dvdread \ - --disable-dvdread-internal \ - --disable-libdvdcss-internal \ - --disable-enca \ - --disable-ftp \ - --disable-vstream \ - \ - --disable-gif \ - --enable-png \ - --enable-jpeg \ - --disable-libcdio \ - --disable-qtx \ - --disable-xanim \ - --disable-real \ - --disable-xvid \ - \ - --enable-speex \ - --enable-theora \ - --disable-ladspa \ - --disable-libdv \ - --enable-mad \ - --disable-xmms \ - --disable-musepack \ - \ - --disable-gl \ - --enable-sdl \ - --disable-caca \ - --disable-directx \ - --disable-dvb \ - --enable-xv \ - --disable-vm \ - --disable-xinerama \ - --enable-x11 \ - --disable-directfb \ - --disable-tga \ - --disable-pnm \ - --disable-md5sum \ - \ - --enable-alsa \ - --enable-ossaudio \ - --disable-pulse \ - --disable-jack \ - --disable-openal \ - --enable-select \ - --enable-libass \ - \ - --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \ -" -# -ltheoradec is missing in: -# libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0' - -EXTRA_OECONF_append_armv6 = " --enable-armv6" -EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" - -PACKAGECONFIG ??= "vorbis postproc" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" -PACKAGECONFIG[lame] = ",,lame" -PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc" -PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis" -PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19" -PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123" -PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" -BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" - -CFLAGS_append = " -I${S}/libdvdread4 " - -do_configure() { - sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure - sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure - sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure - sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure - sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure - sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile - sed -i 's|extra_cflags="-I. $extra_cflags"|extra_cflags="-I. -I${STAGING_INCDIR}/directfb $extra_cflags"|g' ${S}/configure - export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" - ./configure ${EXTRA_OECONF} - -} - -do_compile () { - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install-no-man - install -d ${D}/usr/etc/mplayer - install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ - install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ - install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ - [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib -} - -# http://errors.yoctoproject.org/Errors/Details/40734/ -PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- cgit 1.2.3-korg