summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-21 09:24:05 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-31 10:18:33 +0200
commit52fd2575798d9f8b24ca8b7182b09b1cc698a203 (patch)
tree8a5a9bd95534e3a89c442e4b93dc3b42c9f3b57b
parent6e7c9636d276ac02f64aa48fb4fb36f9ee8f3076 (diff)
downloadmeta-openembedded-52fd2575798d9f8b24ca8b7182b09b1cc698a203.tar.gz
meta-efl: remove this now pretty empty layer
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-efl/COPYING.MIT17
-rw-r--r--meta-efl/README18
-rw-r--r--meta-efl/classes/e-base.bbclass14
-rw-r--r--meta-efl/classes/e.bbclass22
-rw-r--r--meta-efl/classes/efl.bbclass66
-rw-r--r--meta-efl/conf/layer.conf35
-rw-r--r--meta-efl/recipes-core/meta/meta-toolchain-efl.bb6
-rw-r--r--meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb100
-rw-r--r--meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb18
-rw-r--r--meta-efl/recipes-efl/efl/edb_svn.bb16
-rw-r--r--meta-efl/recipes-efl/efl/imlib2_git.bb45
-rw-r--r--meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch33
-rw-r--r--meta-efl/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch11
-rw-r--r--meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb63
14 files changed, 0 insertions, 464 deletions
diff --git a/meta-efl/COPYING.MIT b/meta-efl/COPYING.MIT
deleted file mode 100644
index fb950dc69..000000000
--- a/meta-efl/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
1Permission is hereby granted, free of charge, to any person obtaining a copy
2of this software and associated documentation files (the "Software"), to deal
3in the Software without restriction, including without limitation the rights
4to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5copies of the Software, and to permit persons to whom the Software is
6furnished to do so, subject to the following conditions:
7
8The above copyright notice and this permission notice shall be included in
9all copies or substantial portions of the Software.
10
11THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
12IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
15LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
17THE SOFTWARE.
diff --git a/meta-efl/README b/meta-efl/README
deleted file mode 100644
index cfffc4723..000000000
--- a/meta-efl/README
+++ /dev/null
@@ -1,18 +0,0 @@
1This layer depends on:
2
3URI: git://github.com/openembedded/oe-core.git
4branch: master
5revision: HEAD
6
7URI: git://github.com/openembedded/meta-oe.git
8layers: meta-oe, meta-python
9branch: master
10revision: HEAD
11
12Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-efl]' in the subject'
13
14When sending single patches, please using something like:
15'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-efl][PATCH'
16
17Interim layer maintainers: Koen Kooi <koen@dominion.thruhere.net>
18 Martin Jansa <martin.jansa@gmail.com>
diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
deleted file mode 100644
index e0ae2285d..000000000
--- a/meta-efl/classes/e-base.bbclass
+++ /dev/null
@@ -1,14 +0,0 @@
1HOMEPAGE = "http://www.enlightenment.org"
2SRCNAME ?= "${BPN}"
3SRCVER ?= "${PV}"
4
5EFL_SRCREV ?= "82070"
6
7ARM_INSTRUCTION_SET = "arm"
8
9S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
10
11# each efl or e17 module is installing module.so in different directory, disable shlibs providers for them
12# evas-engine-gl-x11-1.7.7 evas-engine-software-16-1.7.7 evas-engine-software-16-x11-1.7.7 evas-engine-software-x11-1.7.7 evas-engine-wayland-shm-1.7.7 evas-cserve2-bmp-1.7.7 evas-cserve2-eet-1.7.7 evas-cserve2-ico-1.7.7 evas-cserve2-jpeg-1.7.7 evas-cserve2-pmaps-1.7.7 evas-cserve2-png-1.7.7 evas-cserve2-psd-1.7.7 evas-cserve2-tga-1.7.7 evas-cserve2-tiff-1.7.7 evas-cserve2-wbmp-1.7.7 evas-cserve2-xpm-1.7.7 evas-loader-bmp-1.7.7 evas-loader-generic-1.7.7 evas-loader-gif-1.7.7 evas-loader-ico-1.7.7 evas-loader-jpeg-1.7.7 evas-loader-pmaps-1.7.7 evas-loader-png-1.7.7 evas-loader-psd-1.7.7 evas-loader-tga-1.7.7 evas-loader-tiff-1.7.7 evas-loader-wbmp-1.7.7 evas-loader-xpm-1.7.7 evas-saver-jpeg-1.7.7 evas-saver-png-1.7.7 evas-saver-tiff-1.7.7 evas-engine-fb-1.7.7
13# emotion-1.7.7 elementary-1.7.7 elementary-tests-1.7.7 elementary-accessibility-1.7.7 e-wm-0.17.3 elfe-0.0.1+svnr82070 shr-e-gadgets-0.0.0+gitr1+27b6c17d73 cpu-0.0.1+svnr82070 places-0.1.0+svnr82070 forecasts-0.2.0+svnr82070 uptime-0.0.2+svnr82070 screenshot-0.3.0+svnr82070 exalt-client-0.0.1+svnr82070 diskio-0.0.1+svnr82070 rain-0.0.3+svnr82070 news-0.1.0+svnr82070 flame-0.0.3+svnr82070
14PRIVATE_LIBS = "module.so"
diff --git a/meta-efl/classes/e.bbclass b/meta-efl/classes/e.bbclass
deleted file mode 100644
index 4ee80bf57..000000000
--- a/meta-efl/classes/e.bbclass
+++ /dev/null
@@ -1,22 +0,0 @@
1SECTION = "e/apps"
2
3inherit e-base autotools pkgconfig binconfig
4
5do_prepsources () {
6 make clean distclean || true
7}
8addtask prepsources after do_patch before do_configure
9
10do_configure_append() {
11 find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
12}
13
14export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
15export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
16
17PACKAGES =+ "${PN}-themes"
18PACKAGES += "${PN}-lib"
19
20FILES_${PN}-lib = "${libdir}/lib*.so.*"
21FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
22FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass
deleted file mode 100644
index eb40e4bc3..000000000
--- a/meta-efl/classes/efl.bbclass
+++ /dev/null
@@ -1,66 +0,0 @@
1SECTION = "e/libs"
2LICENSE = "MIT & BSD"
3DEPENDS += "pkgconfig-native"
4
5# revision 0d93ec84b30bc1bee2caaee72d667f87bc468a70 made SRCDATE and hence PV go backwards, so we need to up PE to unbreak builds and feeds :(
6PE = "2"
7
8inherit e-base autotools
9
10# evas-native looks at this var, so keep it
11
12do_configure_prepend() {
13 autopoint || touch config.rpath
14}
15
16do_install_prepend () {
17 for i in `find ${B}/ -name "*.pc" -type f` ; do \
18 sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i
19 done
20}
21
22PACKAGES =+ "${PN}-themes"
23PACKAGES += "${PN}-tests"
24PACKAGES += "${PN}-eolian"
25
26FILES_${PN} = "${libdir}/*.so.* \
27 ${libdir}/edje/modules/${PN}/*/module.so \
28 ${libdir}/${PN}/plugins/*.so \
29 ${datadir}/dbus-1/services/* \
30"
31
32
33FILES_${PN}-themes = "${datadir}/${PN}/themes \
34 ${datadir}/${PN}/data \
35 ${libdir}/${PN}/plugins/data/*.edj \
36 ${datadir}/${PN}/fonts \
37 ${datadir}/${PN}/pointers \
38 ${datadir}/${PN}/images \
39 ${datadir}/${PN}/users \
40 ${datadir}/${PN}/images \
41 ${datadir}/${PN}/styles"
42
43FILES_${PN}-dev += "${bindir}/${PN}-config \
44 ${libdir}/pkgconfig/* \
45 ${libdir}/lib*.la \
46 ${libdir}/*.so \
47 ${libdir}/${PN}/*.la \
48 ${libdir}/${PN}/*/*.la \
49 ${datadir}/${PN}/edje_externals \
50 ${libdir}/edje/modules/${PN}/*/module.la \
51"
52
53FILES_${PN}-eolian = " \
54 ${datadir}/eolian/include \
55"
56
57FILES_${PN}-staticdev += "${libdir}/${BPN}/*/*.a"
58
59FILES_${PN}-dbg += "${libdir}/${PN}/.debug \
60 ${libdir}/${PN}/*/.debug \
61 ${libdir}/edje/modules/${PN}/*/.debug/module.so \
62"
63
64FILES_${PN}-tests = "${bindir}/${PN} \
65 ${bindir}/*_* \
66 ${datadir}/${PN}"
diff --git a/meta-efl/conf/layer.conf b/meta-efl/conf/layer.conf
deleted file mode 100644
index ea90ce28d..000000000
--- a/meta-efl/conf/layer.conf
+++ /dev/null
@@ -1,35 +0,0 @@
1# We have a conf and classes directory, append to BBPATH
2BBPATH .= ":${LAYERDIR}"
3
4# We have a recipes directory, add to BBFILES
5BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
6
7BBFILE_COLLECTIONS += "efl-layer"
8BBFILE_PATTERN_efl-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_efl-layer = "7"
10
11# This should only be incremented on significant changes that will
12# cause compatibility issues with other layers
13LAYERVERSION_efl-layer = "1"
14
15LAYERDEPENDS_efl-layer = "core openembedded-layer"
16
17E_MIRROR = "http://download.enlightenment.org/releases"
18E_RELEASES = "http://download.enlightenment.org/rel"
19E_SVN = "svn://svn.enlightenment.org/svn/e"
20
21# RDEPENDS on update-alternatives provider opkg-utils
22SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
23 exquisite-theme-illume->opkg-utils \
24"
25
26# RDEPENDS on e-wm
27SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
28 e-wm-theme-illume-efenniht->e-wm \
29 e-wm-theme-illume-neo->e-wm \
30 e-wm-theme-b-and-w->e-wm \
31"
32
33SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
34 packagegroup-efl-sdk->packagegroup-core-sdk \
35"
diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
deleted file mode 100644
index b7b7fca89..000000000
--- a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1TOOLCHAIN_TARGET_EFLTASK ?= "packagegroup-efl-standalone-sdk-target packagegroup-efl-standalone-sdk-target-dbg"
2TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_EFLTASK}"
3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-efl-${DISTRO_VERSION}"
4require recipes-core/meta/meta-toolchain.bb
5
6TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"
diff --git a/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb b/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb
deleted file mode 100644
index 6925c872a..000000000
--- a/meta-efl/recipes-efl/e17/illume-keyboards-shr_git.bb
+++ /dev/null
@@ -1,100 +0,0 @@
1SECTION = "x11/data"
2
3SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master \
4 file://0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch \
5 file://LICENSE"
6S = "${WORKDIR}/git"
7
8SRCREV = "4064489f359a1addf572089b582f317dff5f50e1"
9PV = "0.0+gitr${SRCPV}"
10PE = "1"
11PR = "r5"
12LICENSE = "MIT & BSD"
13LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
14
15CLEANBROKEN = "1"
16
17PACKAGES = "\
18illume-keyboard-alpha \
19illume-keyboard-arabic \
20illume-keyboard-browse \
21illume-keyboard-danish \
22illume-keyboard-default-alt \
23illume-keyboard-dutch \
24illume-keyboard-dvorak \
25illume-keyboard-finnish \
26illume-keyboard-french \
27illume-keyboard-german \
28illume-keyboard-hebrew \
29illume-keyboard-numeric-alt \
30illume-keyboard-russian \
31illume-keyboard-russian-terminal \
32illume-keyboard-persian \
33"
34
35inherit allarch
36KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume-keyboard/keyboards"
37
38AUTHOR_illume-keyboard-alpha = "Jesus McCloud"
39DESCRIPTION_illume-keyboard-alpha = "Illume keyboard with phone-like layout"
40FILES_illume-keyboard-alpha = "${KEYBOARDS_DIR}/Alpha.kbd"
41
42AUTHOR_illume-keyboard-arabic = "Mohammad Fahmi / Tom Hacohen"
43DESCRIPTION_illume-keyboard-arabic = "Illume keyboard with arabic layout"
44FILES_illume-keyboard-arabic = "${KEYBOARDS_DIR}/Arabic.kbd ${KEYBOARDS_DIR}/Arabic.png"
45
46AUTHOR_illume-keyboard-browse = "Pander"
47DESCRIPTION_illume-keyboard-browse = "Illume keyboard with a layout optimized for browsing"
48FILES_illume-keyboard-browse = "${KEYBOARDS_DIR}/Browse.kbd ${KEYBOARDS_DIR}/end-browse.png ${KEYBOARDS_DIR}/pagedown-browse.png ${KEYBOARDS_DIR}/browse.png ${KEYBOARDS_DIR}/home-browse.png ${KEYBOARDS_DIR}/pageup-browse.png ${KEYBOARDS_DIR}/space-browse.png"
49
50AUTHOR_illume-keyboard-danish = "Esben Damgaard"
51DESCRIPTION_illume-keyboard-danish = "Illume keyboard with danish layout"
52FILES_illume-keyboard-danish = "${KEYBOARDS_DIR}/Danish.kbd ${KEYBOARDS_DIR}/danish.png"
53
54AUTHOR_illume-keyboard-default-alt = "Pander"
55DESCRIPTION_illume-keyboard-default-alt = "Illume keyboard with an alternative default layout"
56FILES_illume-keyboard-default-alt = "${KEYBOARDS_DIR}/Default-alt.kbd"
57
58AUTHOR_illume-keyboard-dutch = "Pander"
59DESCRIPTION_illume-keyboard-dutch = "Illume keyboard with dutch layout"
60FILES_illume-keyboard-dutch = "${KEYBOARDS_DIR}/capslock-negative.png ${KEYBOARDS_DIR}/end.png ${KEYBOARDS_DIR}/pagedown.png ${KEYBOARDS_DIR}/qwerty-dutch-nl.png ${KEYBOARDS_DIR}/Terminal-dutch-nl.kbd ${KEYBOARDS_DIR}/capslock.png ${KEYBOARDS_DIR}/home.png ${KEYBOARDS_DIR}/pageup.png ${KEYBOARDS_DIR}/space.png"
61
62AUTHOR_illume-keyboard-dvorak = "Gabor Adam TOTH"
63DESCRIPTION_illume-keyboard-dvorak = "Illume keyboard with dvorak layout"
64FILES_illume-keyboard-dvorak = "${KEYBOARDS_DIR}/Dvorak.kbd ${KEYBOARDS_DIR}/dvorak.png"
65
66AUTHOR_illume-keyboard-finnish = "Olof Sjöbergh / Jussi Timperi"
67DESCRIPTION_illume-keyboard-finnish = "Illume keyboard with finnish layout"
68FILES_illume-keyboard-finnish = "${KEYBOARDS_DIR}/Finnish.kbd ${KEYBOARDS_DIR}/Finnish.png"
69
70DESCRIPTION_illume-keyboard-french = "Illume keyboard with french layout"
71FILES_illume-keyboard-french = "${KEYBOARDS_DIR}/Azerty.kbd ${KEYBOARDS_DIR}/Azerty.png"
72
73AUTHOR_illume-keyboard-german = "Florian Hackenberger"
74DESCRIPTION_illume-keyboard-german = "Illume keyboard with german layout"
75FILES_illume-keyboard-german = "${KEYBOARDS_DIR}/German.kbd ${KEYBOARDS_DIR}/German.png"
76
77AUTHOR_illume-keyboard-hebrew = "Tom Hacohen"
78DESCRIPTION_illume-keyboard-hebrew = "Illume keyboard with hebrew layout"
79FILES_illume-keyboard-hebrew = "${KEYBOARDS_DIR}/Hebrew.kbd ${KEYBOARDS_DIR}/Alpha-hebrew-il.png"
80
81AUTHOR_illume-keyboard-numeric-alt = "Pander"
82DESCRIPTION_illume-keyboard-numeric-alt = "Illume keyboard with an alternative numeric layout"
83FILES_illume-keyboard-numeric-alt = "${KEYBOARDS_DIR}/Numbers-alt.kbd ${KEYBOARDS_DIR}/numeric-alt.png"
84
85AUTHOR_illume-keyboard-russian = "lucky"
86DESCRIPTION_illume-keyboard-russian = "Illume keyboard with russian layout"
87FILES_illume-keyboard-russian = "${KEYBOARDS_DIR}/X8_Russian.kbd ${KEYBOARDS_DIR}/X8-russian-ru.png"
88
89AUTHOR_illume-keyboard-russian-terminal = "lucky"
90DESCRIPTION_illume-keyboard-russian-terminal = "Illume keyboard with russian layout for the Terminal"
91FILES_illume-keyboard-russian-terminal = "${KEYBOARDS_DIR}/Terminal_Russian.kbd ${KEYBOARDS_DIR}/Terminal-russian-ru.png"
92
93AUTHOR_illume-keyboard-persian = "slave"
94DESCRIPTION_illume-keyboard-persian = "Illume keyboard with persian layout"
95FILES_illume-keyboard-persian = "${KEYBOARDS_DIR}/Persian.kbd ${KEYBOARDS_DIR}/Persian.png"
96
97do_install() {
98 make DESTDIR=${D} install
99}
100
diff --git a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb b/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb
deleted file mode 100644
index 657adcd92..000000000
--- a/meta-efl/recipes-efl/efl/e-wm-illume-dict-pl_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1SUMMARY = "Polish dictionary for Illume keyboard"
2SECTION = "x11/data"
3SRCREV = "38fdd9bb0d8296e984bb6443466801eea6f62f00"
4PV = "1.0+gitr${SRCPV}"
5PE = "1"
6LICENSE = "MIT & BSD"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
8
9SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
10
11S = "${WORKDIR}/git/e-wm/${PN}"
12
13FILES_${PN} = "${libdir}/enlightenment/modules/illume/dicts/Polish.dic"
14
15do_install() {
16 install -d ${D}${libdir}/enlightenment/modules/illume/dicts
17 install -m 0644 ${S}/Polish.dic ${D}${libdir}/enlightenment/modules/illume/dicts/Polish.dic
18}
diff --git a/meta-efl/recipes-efl/efl/edb_svn.bb b/meta-efl/recipes-efl/efl/edb_svn.bb
deleted file mode 100644
index 7c6abdaf0..000000000
--- a/meta-efl/recipes-efl/efl/edb_svn.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1SUMMARY = "Edb is the Enlightenment database library"
2LICENSE = "MIT & BSD"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d8a7c08df3bc3280208b959be7215c25 \
4 file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035"
5
6DEPENDS = "zlib"
7PV = "1.0.5.050+svnr${SRCPV}"
8SRCREV = "${EFL_SRCREV}"
9
10inherit efl
11
12PACKAGECONFIG ??= ""
13PACKAGECONFIG[ncurses] = "--enable-ncurses,--disable-ncurses,ncurses"
14
15SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};protocol=http;scmdata=keep"
16S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/imlib2_git.bb b/meta-efl/recipes-efl/efl/imlib2_git.bb
deleted file mode 100644
index 355b3341f..000000000
--- a/meta-efl/recipes-efl/efl/imlib2_git.bb
+++ /dev/null
@@ -1,45 +0,0 @@
1SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation"
2LICENSE = "MIT & BSD"
3LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
4
5DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
6PROVIDES = "virtual/imlib2"
7PV = "1.4.6+gitr${SRCPV}"
8SRCREV = "560a58e61778d84953944f744a025af6ce986334"
9
10inherit efl binconfig
11SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git"
12S = "${WORKDIR}/git"
13
14# autotools-brokensep
15B = "${S}"
16
17PACKAGECONFIG ??= ""
18PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
19PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff"
20PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
21PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag"
22
23EXTRA_OECONF = "--with-x \
24 --x-includes=${STAGING_INCDIR} \
25 --x-libraries=${STAGING_LIBDIR} "
26
27# TODO: Use more fine granular version
28#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"
29OE_LT_RPATH_ALLOW = "any"
30OE_LT_RPATH_ALLOW[export]="1"
31
32PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
33FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
34FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/"
35FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
36FILES_${PN}-bin = "${bindir}"
37FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
38FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
39FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
40FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"
41
42# png.so jpeg.so id3.so are also provided by lightmediascanner
43PRIVATE_LIBS_imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so"
44
45PRIVATE_LIBS_imlib2-filters = "bumpmap.so colormod.so testfilter.so"
diff --git a/meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch b/meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch
deleted file mode 100644
index 15d4b3f0e..000000000
--- a/meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 5bc5b8c5dad3edec6736fd7e7ce61250c4ce3725 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Jul 2017 17:13:19 -0700
4Subject: [PATCH] Define comparison_fn_t for non-glibc systems
5
6lightmediascanner.c:324:12: error: 'comparison_fn_t' undeclared (first use in this function)
7 (comparison_fn_t)_plugin_sort);
8 ^~~~~~~~~~~~~~~
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/lib/lightmediascanner.c | 5 +++++
13 1 file changed, 5 insertions(+)
14
15diff --git a/src/lib/lightmediascanner.c b/src/lib/lightmediascanner.c
16index 344b247..b866883 100644
17--- a/src/lib/lightmediascanner.c
18+++ b/src/lib/lightmediascanner.c
19@@ -37,6 +37,11 @@
20 #define DEFAULT_SLAVE_TIMEOUT 1000
21 #define DEFAULT_COMMIT_INTERVAL 100
22
23+#if !defined(__GLIBC__)
24+typedef int (*__compar_fn_t) (const void*, const void*);
25+typedef __compar_fn_t comparison_fn_t;
26+#endif
27+
28 #ifdef HAVE_MAGIC_H
29 static magic_t _magic_handle;
30
31--
322.13.2
33
diff --git a/meta-efl/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch b/meta-efl/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch
deleted file mode 100644
index 9528bec79..000000000
--- a/meta-efl/recipes-multimedia/lightmediascanner/files/id3-plugin-support-out-of-tree-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- a/src/plugins/Makefile.am 2015-10-25 16:12:29.331415823 +0000
2+++ b/src/plugins/Makefile.am 2015-10-25 16:14:37.593415808 +0000
3@@ -93,7 +93,7 @@
4 id3_id3_la_SOURCES = id3/id3.c id3/id3v1_genres.c
5 id3_id3_la_LIBADD = $(PLUGINS_LIBADD)
6
7-id3/id3v1_genres.c: $(srcdir)/id3/id3v1_genres.def $(srcdir)/id3/id3v1_genres_gen.awk
8+$(srcdir)/id3/id3v1_genres.c: $(srcdir)/id3/id3v1_genres.def $(srcdir)/id3/id3v1_genres_gen.awk
9 $(AWK) -f $(srcdir)/id3/id3v1_genres_gen.awk $(srcdir)/id3/id3v1_genres.def > $@
10
11 EXTRA_DIST += id3/id3v1_genres.def id3/id3v1_genres_gen.awk
diff --git a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb
deleted file mode 100644
index f2158760f..000000000
--- a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb
+++ /dev/null
@@ -1,63 +0,0 @@
1SUMMARY = "Lightweight media scanner"
2DESCRIPTION = "Lightweight media scanner meant to be used in not-so-powerful devices, like embedded systems or old machines."
3SECTION = "libs/multimedia"
4
5LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 file://src/lib/lightmediascanner.c;endline=21;md5=6d8889bccb4c6c27e8b786342a3eb267"
8
9DEPENDS = "file gawk glib-2.0 sqlite3"
10
11PV = "0.5.1+git${SRCPV}"
12SRCREV = "adfddb3486276a5ed2f5008c9e43a811e1271cc9"
13SRC_URI = "git://github.com/profusion/lightmediascanner.git \
14 file://id3-plugin-support-out-of-tree-build.patch \
15 file://0001-Define-comparison_fn_t-for-non-glibc-systems.patch \
16 "
17
18S = "${WORKDIR}/git"
19
20inherit autotools pkgconfig
21
22EXTRA_OECONF = "--enable-static --disable-mp4"
23
24PACKAGECONFIG ??= "ogg flac wave id3 m3u pls asf rm jpeg png"
25PACKAGECONFIG[generic] = "--enable-generic,--disable-generic,libav"
26PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg libvorbis libtheora"
27PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac"
28PACKAGECONFIG[wave] = "--enable-wave,--disable-wave"
29PACKAGECONFIG[id3] = "--enable-id3,--disable-id3"
30PACKAGECONFIG[m3u] = "--enable-m3u,--disable-m3u"
31PACKAGECONFIG[pls] = "--enable-pls,--disable-pls"
32PACKAGECONFIG[asf] = "--enable-asf,--disable-asf"
33PACKAGECONFIG[rm] = "--enable-rm,--disable-rm"
34PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg"
35PACKAGECONFIG[png] = "--enable-png,--disable-png"
36
37do_install_append() {
38 # Install "test" binary for corresponding package
39 install -d ${D}/${bindir}
40 install -m 755 ${B}/src/bin/.libs/test ${D}/${bindir}/test-lms
41 # Remove .la files for loadable modules
42 rm -f ${D}/${libdir}/${PN}/plugins/*.la
43}
44
45FILES_${PN} += "${datadir}/dbus-1"
46FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug"
47
48PACKAGES_prepend = "${PN}-test "
49FILES_${PN}-test_prepend = "${bindir}/test-lms "
50
51PACKAGES += "${PN}-meta"
52ALLOW_EMPTY_${PN}-meta = "1"
53
54PACKAGES_DYNAMIC = "${PN}-plugin-*"
55
56python populate_packages_prepend () {
57 lms_libdir = d.expand('${libdir}/${PN}')
58 pkgs = []
59
60 pkgs += do_split_packages(d, oe.path.join(lms_libdir, "plugins"), '^(.*)\.so$', d.expand('${PN}-plugin-%s'), 'LightMediaScanner plugin for %s', prepend=True, extra_depends=d.expand('${PN}'))
61 metapkg = d.getVar('PN') + '-meta'
62 d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs))
63}