physfs: Fix multilib install
PATCH 1/3 physfs: Fix multilib install
| ERROR: physfs-1_3.0.1-r0 do_package: QA Issue: physfs: Files/directories were installed but not shipped in any package: | /usr/lib/libphysfs.so | /usr/lib/libphysfs.so.1 | /usr/lib/libphysfs.a | /usr/lib/libphysfs.so.3.0.1 | /usr/lib/pkgconfig | /usr/lib/pkgconfig/physfs.pc | Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
Signed-off-by Andreas Müller <[email protected]>
--- meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-filesystems/recipes-support/physfs/physfs_3.0.1.bb +2 -0
@@ -11,3 +11,5 @@ PE = "1" SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2" SRC_URI[md5sum] = "359f102bcbd62accf84ef32f4863255d" SRC_URI[sha256sum] = "b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1" + +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
Signature · 1 line
2.20.1
PATCH 2/3 faenza-icon-theme: Fix multilib fetch
| ERROR: lib32-faenza-icon-theme-1.3-r0 do_fetch: Fetcher failure for URL: 'http://faenza-icon-theme.googlecode.com/files/lib32-faenza-icon-theme_1.3.zip'. Unable to fetch URL from any source. | ERROR: lib32-faenza-icon-theme-1.3-r0 do_fetch: Function failed: base_do_fetch
Signed-off-by Andreas Müller <[email protected]>
--- .../recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb +1 -1
@@ -8,7 +8,7 @@ inherit allarch gtk-icon-cache S = "${WORKDIR}" -SRC_URI = "http://faenza-icon-theme.googlecode.com/files/${PN}_${PV}.zip" +SRC_URI = "http://faenza-icon-theme.googlecode.com/files/${BPN}_${PV}.zip" SRC_URI[md5sum] = "e9bd6106d13017ce06d24b586259ae9c" SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a"
Signature · 1 line
2.20.1
PATCH 3/3 ftgl: initial add 2.1.3-rc5
In reply to Andreas MüllerHave this in meta-qt5-extra for a while but now it is required by upcoming chromium-bsi (meta-games). So move a layer 'up'.
Signed-off-by Andreas Müller <[email protected]>
--- ...001-use-pkg-config-to-find-freetype2.patch | 38 +++++++++++++++++++ ....am-remove-useless-and-breaking-code.patch | 38 +++++++++++++++++++ .../recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb | 24 ++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch create mode 100644 meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch create mode 100644 meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Sun, 23 Oct 2016 22:46:43 +0200 +Subject: [PATCH] use pkg-config to find freetype2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: inappropriate [OE specific] + +Signed-off-by: Andreas Müller <[email protected]> +--- + configure.ac | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 53560ea..b5bb6a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup) + + AC_PATH_X + +-AC_CHECK_FT2([9.0.3],[], +- [AC_MSG_ERROR([FreeType2 is required to compile this library])]) ++PKG_CHECK_MODULES(FT2, freetype2, ++ CFLAGS="$CFLAGS $FT2_CFLAGS" ++ LIBS="$LIBS $FT2_LIBS", ++ AC_MSG_ERROR([FreeType2 is required to compile this library]) ++) ++AC_SUBST([FT2_CFLAGS]) ++AC_SUBST([FT2_LIBS]) + + AC_PATH_XTRA + +-- +2.5.5 +
meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch new file +38 -0
@@ -0,0 +1,38 @@ +From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Sun, 23 Oct 2016 23:54:14 +0200 +Subject: [PATCH] Makefile.am: remove useless and breaking code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <[email protected]> +--- + Makefile.am | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 89a8a7f..e582a34 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,15 +24,6 @@ EXTRA_DIST = \ + m4 \ + $(NULL) + +-# Print out an informative summary. +-all-local: +- @$(ECHO) "Done." +- @$(ECHO) +- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ +- $(ECHO) "---" ;\ +- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ +- fi +- @$(ECHO) + + # Upload documentation + DOC = docs/html docs/latex/ftgl.pdf +-- +2.5.5 +
meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb new file +24 -0
@@ -0,0 +1,24 @@ +SUMMARY = "OpenGL frontend to Freetype 2" +HOMEPAGE = "https://sourceforge.net/projects/ftgl/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" + +inherit autotools pkgconfig + +DEPENDS += " \ + freetype \ + freeglut \ +" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0001-use-pkg-config-to-find-freetype2.patch \ + file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ +" +SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" +SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" + +S = "${WORKDIR}/ftgl-2.1.3~rc5" + +# undefined reference to symbol 'sin@@GLIBC_2.4' +CFLAGS += "-lm"
Signature · 1 line
2.20.1