[oe-commits] [meta-openembedded] 02/18: gerbera: clean recipe
git at git.openembedded.org
git at git.openembedded.org
Thu Sep 14 14:41:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 90be7f59246f08c1791f54edabba00e12b2b9967
Author: Fabien Lahoudere <fabien.lahoudere at collabora.co.uk>
AuthorDate: Wed Sep 13 22:05:37 2017 +0200
gerbera: clean recipe
Clean the recipe and change the name of libupnp to libupnp1.8.
Signed-off-by: Fabien Lahoudere <fabien.lahoudere at collabora.co.uk>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../recipes-multimedia/gerbera/gerbera_git.bb | 24 ++++++++++------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
index 2bbedc0..f763cf1 100644
--- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
+++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
@@ -4,31 +4,29 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8"
SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \
- file://gerbera.service "
+ file://gerbera.service \
+"
-
-# Modify these as desired
PV = "1.0+git${SRCPV}"
SRCREV = "4435b165d121195aefd67d0287f7f9349e181d45"
S = "${WORKDIR}/git"
-DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 taglib "
-RDEPENDS_${PN} = "expat zlib curl libupnp e2fsprogs taglib "
+DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 "
SYSTEMD_SERVICE_${PN} = "gerbera.service"
-SYSTEMD_AUTO_ENABLE = "enable"
inherit cmake systemd
-EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_TAGLIB=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${WORKDIR}/recipe-sysroot/usr/include -DLIBUUID_LIBRARIES=-luuid"
+PACKAGECONFIG = ""
+PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib"
+
+EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid"
do_install_append() {
- install -d ${D}/root/.config/
- install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${WORKDIR}/gerbera.service ${D}${systemd_system_unitdir}/
+ install -d ${D}/root/.config/
+ install -d ${D}${systemd_system_unitdir}
+ install -m 0644 ${WORKDIR}/gerbera.service ${D}${systemd_system_unitdir}/
}
-FILES_${PN} += " /root/.config/ \
- ${systemd_system_unitdir}/* \
-"
\ No newline at end of file
+FILES_${PN} += "/root/.config/"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list