gflags: Fix fetch URL
PATCH 1/4 gflags: Fix fetch URL
Fixes:
ARNING: gflags-2.1.2-r0 do_fetch: Failed to fetch URLgit://github.com/gflags/gflags.git;branch=master, attempting MIRRORS if available
ERROR: gflags-2.1.2-r0 do_fetch: Fetcher failure: Unable to find revision 1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c in branch master even from upstream
ERROR: gflags-2.1.2-r0 do_fetch: Fetcher failure for URL:
'git://github.com/gflags/gflags.git;branch=master'. Unable to fetch URL from any source
--- meta-oe/recipes-support/gflags/gflags_2.1.2.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta-oe/recipes-support/gflags/gflags_2.1.2.bb +4 -3
@@ -5,9 +5,10 @@ HOMEPAGE = "https://github.com/gflags/gflags" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" -SRC_URI = "git://github.com/gflags/gflags.git;branch=release" -SRCREV = "1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c" -S = "${WORKDIR}/git/" +SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "ac432de923f9de1e9780b5254884599f" +SRC_URI[sha256sum] = "d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662" +S = "${WORKDIR}/${PN}-${PV}/" FILES_${PN}-dev += "${libdir}/cmake"
Signature · 1 line
2.11.0
PATCH 2/4 gflags: Update to 2.2.0
Need to unset REGISTER_INSTALL_PREFIX to avoid:
WARNING: gflags-2.2.0-r0 do_package: QA Issue: gflags: Files/directories were installed but not shipped in any package:
/home
/home/ricardo
/home/ricardo/.cmake
/home/ricardo/.cmake/packages /home/ricardo/.cmake/packages/gflags /home/ricardo/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
---
meta-oe/recipes-support/gflags/{gflags_2.1.2.bb => gflags_2.2.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/gflags/{gflags_2.1.2.bb => gflags_2.2.0.bb} (76%)meta-oe/recipes-support/gflags/gflags_2.2.0.bb renamed from meta-oe/recipes-support/gflags/gflags_2.1.2.bb +3 -3
@@ -6,15 +6,15 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "ac432de923f9de1e9780b5254884599f" -SRC_URI[sha256sum] = "d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662" +SRC_URI[md5sum] = "b99048d9ab82d8c56e876fb1456c285e" +SRC_URI[sha256sum] = "466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88" S = "${WORKDIR}/${PN}-${PV}/" FILES_${PN}-dev += "${libdir}/cmake" inherit cmake -EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON" +EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF" PACKAGES =+ "${PN}-bash-completion" FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh"
Signature · 1 line
2.11.0
PATCH 3/4 opencv: Add new PACKAGECONFIG text
In reply to Ricardo Ribalda DelgadoFixes dangling dependency on text contrib module
WARNING: opencv-3.1+gitAUTOINC+92387b1ef8-r0 do_package_qa: QA Issue:
libopencv-text rdepends on tesseract, but it isn't a build dependency,
missing tesseract in DEPENDS or PACKAGECONFIG? [build-deps]
--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -0
@@ -69,6 +69,7 @@ PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${ PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
Signature · 1 line
2.11.0
PATCH 4/4 opencv: Remove extra space
In reply to Ricardo Ribalda DelgadoNo functional change, it just looked ugly.
--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +1 -1
@@ -46,7 +46,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" -PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ +PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
Signature · 1 line
2.11.0