diff --git a/recipes-extended/cmusphinx/pocketsphinx_0.8.bb b/recipes-extended/cmusphinx/pocketsphinx_0.8.bb index ced1a1a..3941731 100644 --- a/recipes-extended/cmusphinx/pocketsphinx_0.8.bb +++ b/recipes-extended/cmusphinx/pocketsphinx_0.8.bb @@ -28,3 +28,5 @@ FILES_gstreamer0.10-${PN} += "${libdir}/gstreamer-0.10/libgstpocketsphinx.so" FILES_gstreamer0.10-${PN}-staticdev += "${libdir}/gstreamer-0.10/libgstpocketsphinx.a \ ${libdir}/gstreamer-0.10/libgstpocketsphinx.la" FILES_gstreamer0.10-${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" + +PNBLACKLIST[pocketsphinx] ?= "Depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior" diff --git a/recipes-extended/wxwidgets/wxpython_2.9.5.0.bb b/recipes-extended/wxwidgets/wxpython_2.9.5.0.bb index 5b92565..5a43a2b 100644 --- a/recipes-extended/wxwidgets/wxpython_2.9.5.0.bb +++ b/recipes-extended/wxwidgets/wxpython_2.9.5.0.bb @@ -31,3 +31,5 @@ do_iinstall_append() { cp -a ${D}${STAGING_DIR_HOST}/* ${D} rm -rf ${D}${STAGING_DIR} } + +PNBLACKLIST[wxpython] ?= "Depends on wxwidgets which depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior" diff --git a/recipes-extended/wxwidgets/wxwidgets_2.9.5.bb b/recipes-extended/wxwidgets/wxwidgets_2.9.5.bb index 4dfbe0f..7231c8a 100644 --- a/recipes-extended/wxwidgets/wxwidgets_2.9.5.bb +++ b/recipes-extended/wxwidgets/wxwidgets_2.9.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.wxwidgets.org" LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=18346072db6eb834b6edbd2cdc4f109b" -DEPENDS = "webkit-gtk gstreamer gtk+ jpeg tiff libpng zlib expat libxinerama libglu" +DEPENDS = "webkitgtk gstreamer gtk+ jpeg tiff libpng zlib expat libxinerama libglu" SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.bz2" SRC_URI[md5sum] = "e98c5f92805493f150656403ffef3bb0" @@ -53,3 +53,5 @@ wxwidgets_sysroot_preprocess () { FILES_${PN} += "${bindir} ${libdir}/wx/config" FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile" + +PNBLACKLIST[wxwidgets] ?= "Depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior" diff --git a/recipes-ros/audio-common/sound-play_0.2.13.bb b/recipes-ros/audio-common/sound-play_0.2.13.bb index 204c1e3..83a035c 100644 --- a/recipes-ros/audio-common/sound-play_0.2.13.bb +++ b/recipes-ros/audio-common/sound-play_0.2.13.bb @@ -14,3 +14,5 @@ require audio-common.inc SRC_URI += "file://0002-sound_play-Fix-build-with-DCATKIN_ENABLE_TESTING-OFF.patch;striplevel=2" RRECOMMENDS_${PN} += "roscpp roslib audio-common-msgs diagnostic-msgs gst-plugins-base gst-plugins-ugly gst-plugins-good rospy festival python-gst gst-meta-audio" + +PNBLACKLIST[sound-play] ?= "Depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior" diff --git a/recipes-ros/gscam/gscam_0.2.0.bb b/recipes-ros/gscam/gscam_0.2.0.bb index 87654a3..b021d2d 100644 --- a/recipes-ros/gscam/gscam_0.2.0.bb +++ b/recipes-ros/gscam/gscam_0.2.0.bb @@ -11,3 +11,5 @@ SRC_URI[md5sum] = "b0512882e06f5cdd4c6015f16dceb346" SRC_URI[sha256sum] = "84d02ed9a0bed769bebddfb67d27085ae779aaf9ab1311aaad94e9d17aa0fbc6" inherit catkin + +PNBLACKLIST[gscam] ?= "Depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior" diff --git a/recipes-ros/packagegroups/packagegroup-ros-world.bb b/recipes-ros/packagegroups/packagegroup-ros-world.bb index 445efc8..381be3d 100644 --- a/recipes-ros/packagegroups/packagegroup-ros-world.bb +++ b/recipes-ros/packagegroups/packagegroup-ros-world.bb @@ -145,7 +145,6 @@ RDEPENDS_${PN} = "\ depthimage-to-laserscan \ diff-drive-controller \ gripper-action-controller \ - gscam \ imu-processors \ imu-transformer \ joint-trajectory-controller \ @@ -154,7 +153,6 @@ RDEPENDS_${PN} = "\ move-base \ robot-pose-ekf \ roslint \ - ros-pocketsphinx \ rt-tests-support \ communication-tests \ cyclic-timer-tests \ diff --git a/recipes-ros/robot-model/joint-state-publisher_1.11.14.bb b/recipes-ros/robot-model/joint-state-publisher_1.11.14.bb index 1839fd3..3c3ddfe 100644 --- a/recipes-ros/robot-model/joint-state-publisher_1.11.14.bb +++ b/recipes-ros/robot-model/joint-state-publisher_1.11.14.bb @@ -9,3 +9,5 @@ DEPENDS = "rospy wxpython sensor-msgs" require robot-model.inc RDEPENDS_${PN} = "wxpython" + +PNBLACKLIST[joint-state-publisher] ?= "Depends on wxpython which depends on wxwidgets which depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior" diff --git a/recipes-ros/ros-pocketsphinx/ros-pocketsphinx_0.3.0.bb b/recipes-ros/ros-pocketsphinx/ros-pocketsphinx_0.3.0.bb index 102f081..d19de7f 100644 --- a/recipes-ros/ros-pocketsphinx/ros-pocketsphinx_0.3.0.bb +++ b/recipes-ros/ros-pocketsphinx/ros-pocketsphinx_0.3.0.bb @@ -27,3 +27,5 @@ RDEPENDS_${PN} = "std-srvs rospy gstreamer0.10-pocketsphinx" RRECOMMENDS_${PN} += "gst-plugins-good-gconfelements" ROS_SPN = "ros_pocketsphinx" + +PNBLACKLIST[ros-pocketsphinx] ?= "Depends on old gstreamer 0.10 recipes removed from meta-oe in 2.7 Warrior"