diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-graphics/libforms | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/libforms')
4 files changed, 62 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch new file mode 100644 index 0000000000..db400f7022 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch @@ -0,0 +1,12 @@ +diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am +--- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 12:58:51.968645873 +0000 ++++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:00:48.500635163 +0000 +@@ -11,7 +11,7 @@ + fdesign.1: + cp -p $(srcdir)/fdesign.man fdesign.1 + +-INCLUDES = -I./xpm $(X_CFLAGS) ++INCLUDES = -I./xpm -I$(srcdir)/xpm $(X_CFLAGS) + + bin_PROGRAMS = fdesign + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch new file mode 100644 index 0000000000..c95bd18da8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch @@ -0,0 +1,12 @@ +diff -Naur xforms-1.2.3.orig/lib/Makefile.am xforms-1.2.3/lib/Makefile.am +--- xforms-1.2.3.orig/lib/Makefile.am 2019-02-24 12:53:58.340678373 +0000 ++++ xforms-1.2.3/lib/Makefile.am 2019-02-24 12:54:33.096674102 +0000 +@@ -25,7 +25,7 @@ + man_MANS = xforms.5 + + xforms.5: +- cp -p ./xforms.man xforms.5 ++ cp -p $(srcdir)/xforms.man xforms.5 + + libforms_la_SOURCES = \ + align.c \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch new file mode 100644 index 0000000000..73956dee9f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch @@ -0,0 +1,12 @@ +diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am +--- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 13:08:48.412603250 +0000 ++++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:09:18.412601874 +0000 +@@ -15,7 +15,7 @@ + + bin_PROGRAMS = fdesign + +-fdesign_LDADD = $(top_srcdir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS) ++fdesign_LDADD = $(top_builddir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS) + + fdesign_SOURCES = \ + fd_attribs.c \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb new file mode 100644 index 0000000000..f86d7c16bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The XForms graphical interface widget library " +HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/" +PR = "r0" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86" + +SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar.gz \ + file://fix-link-to-xforms-man.patch \ + file://add-absolute-path-for-include-dir.patch \ + file://fix-path-fdesign_LDADD.patch \ + " + +SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" +SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" + +inherit autotools distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +S = "${WORKDIR}/xforms-${PV}" + +DEPENDS = "libxpm jpeg libx11 mesa" +RDEPENDS_${PN} = "bash" + +EXTRA_OECONF = "--with-extra-inc=${S}/lib" |