@MiLo
I just collected all needed packages of witch I know they need adaptation in master-next. I just made a patch file (that is not tested) It is only to give an easy readable overview. Needed for build vuduo2 and dm8000
Since we can not attach a file anymore here the patch in window
From d6001b50e2c293780019b2f1ef7a1838b7c1f888 Mon Sep 17 00:00:00 2001
From: christophecvr <stefansat@telenet.be>
Date: Mon, 28 Jul 2014 12:51:26 +0200
Subject: [PATCH] Master next cganges needed for vuduo2 build and dm8000
Changes to be committed:
modified: meta-dream/recipes-bsp/drivers/gst-plugin-dreambox-dvbmediasink_0.10.bb
modified: meta-dream/recipes-bsp/drivers/gst-plugin-dtsdownmix.bb
modified: meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb
modified: meta-openpli/recipes-connectivity/rtorrent/rtorrent_0.9.2.bb
deleted: meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bb
renamed: meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bbappend -> meta-openpli/recipes-devtools/python/python-twisted_13.2.0.bbappend
modified: meta-openpli/recipes-multimedia/cdtextinfo/cdtextinfo_0.1.bb
modified: meta-vuplus/recipes-bsp/drivers/gst-plugin-vuplus-dvbmediasink_0.10.bb
modified: meta-vuplus/recipes-bsp/drivers/vuplus-hbbtv-dumpait.bb
---
.../gst-plugin-dreambox-dvbmediasink_0.10.bb | 4 +-
.../recipes-bsp/drivers/gst-plugin-dtsdownmix.bb | 2 +-
.../recipes-connectivity/djmount/djmount_0.71.bb | 2 +-
.../rtorrent/rtorrent_0.9.2.bb | 2 +-
.../python/python-twisted_12.0.0.bb | 237 ---------------------
.../python/python-twisted_12.0.0.bbappend | 11 -
.../python/python-twisted_13.2.0.bbappend | 11 +
.../cdtextinfo/cdtextinfo_0.1.bb | 2 +-
.../drivers/gst-plugin-vuplus-dvbmediasink_0.10.bb | 2 +-
.../recipes-bsp/drivers/vuplus-hbbtv-dumpait.bb | 2 +-
12 files changed, 22 insertions(+), 256 deletions(-)
delete mode 100644 meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bb
delete mode 100644 meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bbappend
create mode 100644 meta-openpli/recipes-devtools/python/python-twisted_13.2.0.bbappend
diff --git a/meta-dream/recipes-bsp/drivers/gst-plugin-dreambox-dvbmediasink_0.10.bb b/meta-dream/recipes-bsp/drivers/gst-plugin-dreambox-dvbmediasink_0.10.bb
index 939af02..66795fd 100644
--- a/meta-dream/recipes-bsp/drivers/gst-plugin-dreambox-dvbmediasink_0.10.bb
+++ b/meta-dream/recipes-bsp/drivers/gst-plugin-dreambox-dvbmediasink_0.10.bb
@@ -8,9 +8,9 @@ PR = "r10"
SCHWERKRAFT_PROJECT = "dvbmediasink"
-inherit autotools schwerkraft-git
+inherit autotools pkgconfig schwerkraft-git
-SRCREV = "7671ff6f07a70151ef183e0f501097de5cf7f1b3"
+#SRCREV = "7671ff6f07a70151ef183e0f501097de5cf7f1b3"
SRC_URI += " \
file://getdecodertime.patch \
diff --git a/meta-dream/recipes-bsp/drivers/gst-plugin-dtsdownmix.bb b/meta-dream/recipes-bsp/drivers/gst-plugin-dtsdownmix.bb
index 9eb9eea..aa4a44c 100644
--- a/meta-dream/recipes-bsp/drivers/gst-plugin-dtsdownmix.bb
+++ b/meta-dream/recipes-bsp/drivers/gst-plugin-dtsdownmix.bb
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/athoik/${PN};branch=master"
S = "${WORKDIR}/git"
-inherit gitpkgv
+inherit pkgconfig gitpkgv
PV = "0.10.0+git${SRCPV}"
PKGV = "0.10.0+git${GITPKGV}"
diff --git a/meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb b/meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb
index 1cd072f..b88172f 100644
--- a/meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb
+++ b/meta-openpli/recipes-connectivity/djmount/djmount_0.71.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
INITSCRIPT_NAME = "djmount"
INITSCRIPT_PARAMS = "defaults"
-inherit autotools update-rc.d
+inherit autotools update-rc.d pkgconfig gettext
EXTRA_OECONF = "--with-external-libupnp --with-fuse-prefix='${STAGING_LIBDIR}'"
diff --git a/meta-openpli/recipes-connectivity/rtorrent/rtorrent_0.9.2.bb b/meta-openpli/recipes-connectivity/rtorrent/rtorrent_0.9.2.bb
index 309bd3b..e3bbf42 100644
--- a/meta-openpli/recipes-connectivity/rtorrent/rtorrent_0.9.2.bb
+++ b/meta-openpli/recipes-connectivity/rtorrent/rtorrent_0.9.2.bb
@@ -10,7 +10,7 @@ PR = "r0"
SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \
file://autoconf-cross-fix.patch"
-inherit autotools
+inherit autotools pkgconfig
SRC_URI[md5sum] = "72c3e9ab859bda7cc8aa96c0b508b09f"
SRC_URI[sha256sum] = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d"
diff --git a/meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bb b/meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bb
deleted file mode 100644
index 2792695..0000000
--- a/meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bb
+++ /dev/null
@@ -1,237 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-
-#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL.
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=40;md5=3fced11d6df719b47505837a51c16ae5"
-
-SRC_URI = "http://twistedmatrix.com/Releases/Twisted/12.0/Twisted-${PV}.tar.bz2"
-SRC_URI[md5sum] = "cf49a8676c21c50faf1b42b528049471"
-SRC_URI[sha256sum] = "e5561c9714583fd052ea9e0b10331609a719b3878f9d2593e4c57eab0ba0effd"
-
-S = "${WORKDIR}/Twisted-${PV}"
-PR = "r1"
-
-inherit setuptools
-
-PACKAGES += "\
- ${PN}-zsh \
- ${PN}-test \
- ${PN}-protocols \
- ${PN}-bin \
- ${PN}-conch \
- ${PN}-lore \
- ${PN}-mail \
- ${PN}-names \
- ${PN}-news \
- ${PN}-runner \
- ${PN}-web \
- ${PN}-words \
- ${PN}-flow \
- ${PN}-pair \
- ${PN}-core \
-"
-
-RDEPENDS_${PN} += "\
- ${PN}-bin \
- ${PN}-conch \
- ${PN}-lore \
- ${PN}-mail \
- ${PN}-names \
- ${PN}-news \
- ${PN}-runner \
- ${PN}-web \
- ${PN}-words \
-"
-
-do_install_append() {
- # remove some useless files before packaging
- find ${D} -name "*.bat" -o -name "*.c" -o -name "*.h" -exec rm {} \;
-}
-
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
-
-FILES_${PN}-test = " \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
-"
-RDEPENDS_${PN}-test = "${PN}"
-
-FILES_${PN}-protocols = " \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/ \
-"
-
-FILES_${PN}-zsh = " \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
-"
-
-FILES_${PN}-bin = " \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \
-"
-
-FILES_${PN}-conch = " \
- ${bindir}/ckeygen \
- ${bindir}/tkconch \
- ${bindir}/conch \
- ${bindir}/conchftp \
- ${bindir}/cftp \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \
-"
-RDEPENDS_${PN}-conch = "${PN}-core ${PN}-protocols"
-
-FILES_${PN}-core = " \
-${bindir}/manhole \
-${bindir}/mktap \
-${bindir}/twistd \
-${bindir}/tap2deb \
-${bindir}/tap2rpm \
-${bindir}/tapconvert \
-${bindir}/tkmktap \
-${bindir}/trial \
-${bindir}/easy_install* \
-${bindir}/pyhtmlizer \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_epoll.so \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_initgroups.so \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \
-"
-RDEPENDS_${PN}-core = "python-core python-zopeinterface"
-
-FILES_${PN}-lore = " \
-${bindir}/bookify \
-${bindir}/lore \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/lore \
-"
-RDEPENDS_${PN}-lore = "${PN}-core"
-
-FILES_${PN}-mail = " \
-${bindir}/mailmail \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
-"
-RDEPENDS_${PN}-mail = "${PN}-core ${PN}-protocols"
-
-FILES_${PN}-names = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
-"
-RDEPENDS_${PN}-names = "${PN}-core"
-
-FILES_${PN}-news = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
-"
-RDEPENDS_${PN}-news = "${PN}-core ${PN}-protocols"
-
-FILES_${PN}-runner = " \
-${libdir}/site-packages/twisted/runner/portmap.so \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
-"
-RDEPENDS_${PN}-runner = "${PN}-core ${PN}-protocols"
-
-FILES_${PN}-web = " \
-${bindir}/websetroot \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
-"
-RDEPENDS_${PN}-web += "${PN}-core ${PN}-protocols"
-
-FILES_${PN}-words = " \
-${bindir}/im \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
-"
-RDEPENDS_${PN}-words += "${PN}-core"
-
-FILES_${PN}-flow = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \"
-RDEPENDS_${PN}-flow += "${PN}-core"
-
-FILES_${PN}-pair = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \
-"
-RDEPENDS_${PN}-pair += "${PN}-core"
-
-FILES_${PN}-dbg += " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
-"
-RDEPENDS_${PN}-dbg = "${PN}"
diff --git a/meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bbappend b/meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bbappend
deleted file mode 100644
index 21d7880..0000000
--- a/meta-openpli/recipes-devtools/python/python-twisted_12.0.0.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "r2"
-
-inherit setuptools
-
-PACKAGES =+ "${PN}-src"
-RDEPENDS_{PN}-src = "${PN}"
-FILES_${PN}-src = " \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \
- ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \
- "
diff --git a/meta-openpli/recipes-devtools/python/python-twisted_13.2.0.bbappend b/meta-openpli/recipes-devtools/python/python-twisted_13.2.0.bbappend
new file mode 100644
index 0000000..21d7880
--- /dev/null
+++ b/meta-openpli/recipes-devtools/python/python-twisted_13.2.0.bbappend
@@ -0,0 +1,11 @@
+PR = "r2"
+
+inherit setuptools
+
+PACKAGES =+ "${PN}-src"
+RDEPENDS_{PN}-src = "${PN}"
+FILES_${PN}-src = " \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \
+ "
diff --git a/meta-openpli/recipes-multimedia/cdtextinfo/cdtextinfo_0.1.bb b/meta-openpli/recipes-multimedia/cdtextinfo/cdtextinfo_0.1.bb
index 864aab8..f26b2fc 100644
--- a/meta-openpli/recipes-multimedia/cdtextinfo/cdtextinfo_0.1.bb
+++ b/meta-openpli/recipes-multimedia/cdtextinfo/cdtextinfo_0.1.bb
@@ -11,4 +11,4 @@ SRC_URI = "http://dreamboxupdate.com/download/sources/${P}.tar.bz2"
SRC_URI[md5sum] = "8fa7eeae52093bb90c1453ca4b8a29c9"
SRC_URI[sha256sum] = "62498d3db29c5de2e9e9119b315d2c8d7558c5a45264f26aabcf1f989437af33"
-inherit autotools
+inherit autotools pkgconfig
diff --git a/meta-vuplus/recipes-bsp/drivers/gst-plugin-vuplus-dvbmediasink_0.10.bb b/meta-vuplus/recipes-bsp/drivers/gst-plugin-vuplus-dvbmediasink_0.10.bb
index 78f3626..545c8e4 100644
--- a/meta-vuplus/recipes-bsp/drivers/gst-plugin-vuplus-dvbmediasink_0.10.bb
+++ b/meta-vuplus/recipes-bsp/drivers/gst-plugin-vuplus-dvbmediasink_0.10.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "gst-ffmpeg"
BRANCH="master"
PR = "r20"
-inherit autotools git-project
+inherit autotools git-project pkgconfig
SRCREV = "91738211ef106ae7d14c1ccc5c4dd26c0f2dbf58"
SRC_URI = "git://schwerkraft.elitedvb.net/dvbmediasink/dvbmediasink.git;protocol=git;branch=${BRANCH} \
file://0001-dvbaudiosink-enable-async.patch;apply=yes \
diff --git a/meta-vuplus/recipes-bsp/drivers/vuplus-hbbtv-dumpait.bb b/meta-vuplus/recipes-bsp/drivers/vuplus-hbbtv-dumpait.bb
index 793668a..08b7f7b 100644
--- a/meta-vuplus/recipes-bsp/drivers/vuplus-hbbtv-dumpait.bb
+++ b/meta-vuplus/recipes-bsp/drivers/vuplus-hbbtv-dumpait.bb
@@ -16,7 +16,7 @@ PKGV = "git${GITPKGV}"
RREPLACES_${PN} = "vuplus-opera-dumpait"
RCONFLICTS_${PN} = "vuplus-opera-dumpait"
-inherit autotools-brokensep
+inherit autotools-brokensep pkgconfig
do_install() {
install -d ${D}/usr/lib/${DESTDIR}
--
1.9.1