From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb | 17 ----------------- .../meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb (limited to 'meta-openembedded/meta-oe/recipes-graphics/freeglut') diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb deleted file mode 100644 index 3b540bb789..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "FreeGLUT is a free-software/open-source alternative to the OpenGL \ - Utility Toolkit (GLUT) library" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" - -SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "90c3ca4dd9d51cf32276bc5344ec9754" -SRC_URI[sha256sum] = "2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2" - -inherit cmake features_check - -# depends on virtual/libx11, virtual/libgl -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -PROVIDES += "mesa-glut" - -DEPENDS = "virtual/libx11 libxmu libxi virtual/libgl libglu libxrandr" diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb new file mode 100644 index 0000000000..851641c083 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "FreeGLUT is a free-software/open-source alternative to the OpenGL \ + Utility Toolkit (GLUT) library" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" + +SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "cd5c670c1086358598a6d4a9d166949d" +SRC_URI[sha256sum] = "d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68" + +inherit cmake features_check + +# depends on virtual/libx11, virtual/libgl +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +PROVIDES += "mesa-glut" + +DEPENDS = "virtual/libx11 libxmu libxi virtual/libgl libglu libxrandr" -- cgit v1.2.3