summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-04-27 11:04:51 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-31 10:18:33 +0200
commitec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch)
treee16d2a838f4561d5538928a58f805e5f1373225a /meta-oe/recipes-multimedia
parent6775acb048dabd624c5c8197b683aba45ed91569 (diff)
downloadmeta-openembedded-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/minidlna/minidlna.inc39
-rw-r--r--meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb6
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch26
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch136
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb159
5 files changed, 0 insertions, 366 deletions
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
deleted file mode 100644
index b333fce0b..000000000
--- a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
+++ /dev/null
@@ -1,39 +0,0 @@
1DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
2being fully compliant with DLNA/UPnP-AV clients."
3LICENSE = "GPL-2.0|BSD"
4DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis"
5
6# because it depends on libav which has commercial flag
7LICENSE_FLAGS = "commercial"
8
9inherit gettext autotools-brokensep update-rc.d systemd
10
11SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
12 file://minidlna-daemon.init.d \
13 file://minidlna.service "
14
15S = "${WORKDIR}/git"
16
17# This remove "--exclude=autopoint" option from autoreconf argument to avoid
18# configure.ac:30: error: required file './ABOUT-NLS' not found
19EXTRA_AUTORECONF = ""
20
21do_install_append(){
22 install -d ${D}${sysconfdir}
23 install -m 0755 minidlna.conf ${D}${sysconfdir}
24
25# Systemd script
26 install -d ${D}${nonarch_base_libdir}/systemd/system
27 install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system
28
29# Sysvinit script
30 install -d ${D}${sysconfdir}/init.d
31 install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna
32
33}
34
35SYSTEMD_SERVICE_${PN} = "minidlna.service"
36
37INITSCRIPT_NAME = "minidlna"
38INITSCRIPT_PARAMS = "defaults 90"
39
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 81d700a7b..000000000
--- a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require ${BPN}.inc
2
3SRCREV = "v1_1_5"
4LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
5
6PNBLACKLIST[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 e232595cd..000000000
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 27 Mar 2014 00:08:54 +0100
4Subject: [PATCH] configure: don't disable ASS support when explicitly enabled
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 configure | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/configure b/configure
12index 60fd308..2f7df3b 100755
13--- a/configure
14+++ b/configure
15@@ -4346,7 +4346,7 @@ fi
16
17
18 echocheck "SSA/ASS support"
19-if test "$_ass" = auto ; then
20+if test "$_ass" = auto -o "$_ass" = yes ; then
21 if pkg_config_add libass ; then
22 _ass=yes
23 def_ass='#define CONFIG_ASS 1'
24--
251.9.1
26
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 b4d98412f..000000000
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
1From 0571bb4f1a6e1934ee7e093ce7aa517b9bac8e6a Mon Sep 17 00:00:00 2001
2From: Awais Belal <awais_belal@mentor.com>
3Date: Sun, 17 Jan 2016 14:46:10 +0500
4Subject: [PATCH] demux_ogg: partially port libtheora glue code to Theora 1.0
5 API
6
7This partially backports the following commit to allow building
8with gcc-5.x and otherwise fails to find the definition of
9the _ilog function the way it is used.
10
11https://github.com/pigoz/mplayer-svn/commit/85e51408cd00979fc209da8e3a39b6f0e7f325bc
12
13Signed-off-by: Awais Belal <awais_belal@mentor.com>
14---
15 libmpdemux/demux_ogg.c | 52 ++++++++++++++++++++++++++------------------------
16 1 file changed, 27 insertions(+), 25 deletions(-)
17
18diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
19index 9eea061..9144426 100644
20--- a/libmpdemux/demux_ogg.c
21+++ b/libmpdemux/demux_ogg.c
22@@ -50,8 +50,7 @@
23 #endif
24
25 #ifdef CONFIG_OGGTHEORA
26-#include <theora/theora.h>
27-int _ilog (unsigned int); /* defined in many places in theora/lib/ */
28+#include <theora/theoradec.h>
29 #endif
30
31 #define BLOCK_SIZE 4096
32@@ -62,9 +61,10 @@ int _ilog (unsigned int); /* defined in many places in theora/lib/ */
33 */
34 #ifdef CONFIG_OGGTHEORA
35 typedef struct theora_struct_st {
36- theora_state st;
37- theora_comment cc;
38- theora_info inf;
39+ th_setup_info *tsi;
40+ th_dec_ctx *tctx;
41+ th_comment tc;
42+ th_info ti;
43 } theora_struct_t;
44 #endif
45
46@@ -117,7 +117,7 @@ typedef struct ogg_stream {
47 float samplerate; /// granulpos 2 time
48 int64_t lastpos;
49 int32_t lastsize;
50- int keyframe_frequency_force;
51+ int keyframe_granule_shift;
52
53 // Logical stream state
54 ogg_stream_state stream;
55@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_packet(ogg_stream_t *os, ogg_packet *pack,
56 have theora_state st, until all header packets were passed to the
57 decoder. */
58 if (!pack->bytes || !(*data&0x80)) {
59- int keyframe_granule_shift = _ilog(os->keyframe_frequency_force - 1);
60- int64_t iframemask = (1 << keyframe_granule_shift) - 1;
61+ int64_t iframemask = iframemask = (1 << os->keyframe_granule_shift) - 1;
62
63 if (pack->granulepos >= 0) {
64- os->lastpos = pack->granulepos >> keyframe_granule_shift;
65+ os->lastpos = pack->granulepos >> os->keyframe_granule_shift;
66 os->lastpos += pack->granulepos & iframemask;
67 *keyframe = (pack->granulepos & iframemask) == 0;
68 } else {
69@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer)
70 #ifdef CONFIG_OGGTHEORA
71 } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
72 int errorCode = 0;
73- theora_info inf;
74- theora_comment cc;
75+ th_info ti;
76+ th_comment tc;
77+ th_setup_info *tsi = NULL;
78
79- theora_info_init (&inf);
80- theora_comment_init (&cc);
81+ th_info_init (&ti);
82+ th_comment_init (&tc);
83
84- errorCode = theora_decode_header (&inf, &cc, &pack);
85- if (errorCode) {
86+ errorCode = th_decode_headerin(&ti, &tc, &tsi, &pack);
87+ if (errorCode < 0) {
88 mp_msg(MSGT_DEMUX, MSGL_ERR,
89 "Theora header parsing failed: %i \n", errorCode);
90 } else {
91@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer)
92 sh_v->bih = calloc(1, sizeof(*sh_v->bih));
93 sh_v->bih->biSize = sizeof(*sh_v->bih);
94 sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA;
95- sh_v->fps = ((double)inf.fps_numerator) / (double)inf.fps_denominator;
96- sh_v->frametime = ((double)inf.fps_denominator) / (double)inf.fps_numerator;
97- sh_v->disp_w = sh_v->bih->biWidth = inf.frame_width;
98- sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height;
99+ sh_v->fps = ((double)ti.fps_numerator) / (double)ti.fps_denominator;
100+ sh_v->frametime = ((double)ti.fps_denominator) / (double)ti.fps_numerator;
101+ sh_v->i_bps = ti.target_bitrate / 8;
102+ sh_v->disp_w = sh_v->bih->biWidth = ti.frame_width;
103+ sh_v->disp_h = sh_v->bih->biHeight = ti.frame_height;
104 sh_v->bih->biBitCount = 24;
105 sh_v->bih->biPlanes = 3;
106 sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount / 8) * sh_v->bih->biWidth * sh_v->bih->biHeight);
107 ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
108 ogg_d->subs[ogg_d->num_sub].theora = 1;
109- ogg_d->subs[ogg_d->num_sub].keyframe_frequency_force = inf.keyframe_frequency_force;
110+ ogg_d->subs[ogg_d->num_sub].keyframe_granule_shift = ti.keyframe_granule_shift;
111 ogg_d->subs[ogg_d->num_sub].id = n_video;
112 n_video++;
113 mp_msg(MSGT_DEMUX, MSGL_INFO,
114 "[Ogg] stream %d: video (Theora v%d.%d.%d), -vid %d\n",
115 ogg_d->num_sub,
116- (int)inf.version_major,
117- (int)inf.version_minor,
118- (int)inf.version_subminor,
119+ (int)ti.version_major,
120+ (int)ti.version_minor,
121+ (int)ti.version_subminor,
122 n_video - 1);
123 if (mp_msg_test(MSGT_HEADER, MSGL_V))
124 print_video_header(sh_v->bih, MSGL_V);
125 }
126- theora_comment_clear(&cc);
127- theora_info_clear(&inf);
128+ th_comment_clear(&tc);
129+ th_info_clear(&ti);
130+ th_setup_free(tsi);
131 #endif /* CONFIG_OGGTHEORA */
132 } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
133 sh_a = new_sh_audio_aid(demuxer, ogg_d->num_sub, n_audio);
134--
1351.9.1
136
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 1a4ae27e6..000000000
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ /dev/null
@@ -1,159 +0,0 @@
1SUMMARY = "Open Source multimedia player"
2SECTION = "multimedia"
3HOMEPAGE = "http://www.mplayerhq.hu/"
4DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
5 libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
6 libxv virtual/libx11 libass speex faad2 libxscrnsaver"
7
8RDEPENDS_${PN} = "mplayer-common"
9PROVIDES = "mplayer"
10RPROVIDES_${PN} = "mplayer"
11RCONFLICTS_${PN} = "mplayer"
12
13# Depends on xsp, libxv, virtual/libx11, libxscrnsaver
14REQUIRED_DISTRO_FEATURES = "x11"
15
16# because it depends on libpostproc/libav which has commercial flag
17LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}"
18
19LICENSE = "GPLv3"
20LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
21
22SRC_URI = "git://repo.or.cz/mplayer.git \
23 file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \
24 file://0001-demux_ogg-partially-port-libtheora-glue-code-to-Theo.patch \
25"
26
27SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9"
28
29ARM_INSTRUCTION_SET = "arm"
30
31PV = "2.0+gitr${SRCPV}"
32PR = "r13"
33
34PARALLEL_MAKE = ""
35
36S = "${WORKDIR}/git"
37
38FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/"
39CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
40 /usr/etc/mplayer/example.conf \
41 /usr/etc/mplayer/codecs.conf \
42"
43
44inherit autotools-brokensep pkgconfig python3native
45
46EXTRA_OECONF = " \
47 --prefix=/usr \
48 --mandir=${mandir} \
49 --target=${SIMPLE_TARGET_SYS} \
50 \
51 --disable-lirc \
52 --disable-lircc \
53 --disable-joystick \
54 --disable-vm \
55 --disable-xf86keysym \
56 --enable-tv \
57 --enable-tv-v4l2 \
58 --disable-tv-bsdbt848 \
59 --enable-rtc \
60 --enable-networking \
61 --disable-smb \
62 --disable-dvdnav \
63 --enable-dvdread \
64 --disable-dvdread-internal \
65 --disable-libdvdcss-internal \
66 --disable-enca \
67 --disable-ftp \
68 --disable-vstream \
69 \
70 --disable-gif \
71 --enable-png \
72 --enable-jpeg \
73 --disable-libcdio \
74 --disable-qtx \
75 --disable-xanim \
76 --disable-real \
77 --disable-xvid \
78 \
79 --enable-speex \
80 --enable-theora \
81 --disable-ladspa \
82 --disable-libdv \
83 --enable-mad \
84 --disable-xmms \
85 --disable-musepack \
86 \
87 --disable-gl \
88 --enable-sdl \
89 --disable-caca \
90 --disable-directx \
91 --disable-dvb \
92 --enable-xv \
93 --disable-vm \
94 --disable-xinerama \
95 --enable-x11 \
96 --disable-directfb \
97 --disable-tga \
98 --disable-pnm \
99 --disable-md5sum \
100 \
101 --enable-alsa \
102 --enable-ossaudio \
103 --disable-pulse \
104 --disable-jack \
105 --disable-openal \
106 --enable-select \
107 --enable-libass \
108 \
109 --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \
110"
111# -ltheoradec is missing in:
112# libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0'
113
114EXTRA_OECONF_append_armv6 = " --enable-armv6"
115EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
116
117PACKAGECONFIG ??= "vorbis postproc"
118PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
119PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52"
120PACKAGECONFIG[lame] = ",,lame"
121PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc"
122PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis"
123PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19"
124PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123"
125PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
126
127FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
128BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
129
130CFLAGS_append = " -I${S}/libdvdread4 "
131
132do_configure() {
133 sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
134 sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
135 sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
136 sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
137 sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
138 sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
139 sed -i 's|extra_cflags="-I. $extra_cflags"|extra_cflags="-I. -I${STAGING_INCDIR}/directfb $extra_cflags"|g' ${S}/configure
140 export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
141 ./configure ${EXTRA_OECONF}
142
143}
144
145do_compile () {
146 oe_runmake
147}
148
149do_install() {
150 oe_runmake 'DESTDIR=${D}' install-no-man
151 install -d ${D}/usr/etc/mplayer
152 install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
153 install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
154 install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
155 [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib
156}
157
158# http://errors.yoctoproject.org/Errors/Details/40734/
159PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3 - the recipe will be removed on 2017-09-01 unless the issue is fixed"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-15 21:33:45 +0000