diff options
| -rw-r--r-- | classes/sanity.bbclass | 5 | ||||
| -rw-r--r-- | packages/gpe-nmf/gpe-nmf-0.22/fix-includepath.patch | 15 | ||||
| -rw-r--r-- | packages/gpe-nmf/gpe-nmf_0.22.bb | 5 |
3 files changed, 22 insertions, 3 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 8253b27930..a06753b198 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -31,7 +31,10 @@ def check_app_exists(app, d): def check_sanity(e): from bb import note, error, data, __version__ from bb.event import Handled, NotHandled, getName - from distutils.version import LooseVersion + try: + from distutils.version import LooseVersion + except ImportError: + def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 import os # Check the bitbake version meets minimum requirements diff --git a/packages/gpe-nmf/gpe-nmf-0.22/fix-includepath.patch b/packages/gpe-nmf/gpe-nmf-0.22/fix-includepath.patch new file mode 100644 index 0000000000..cf6bd12da7 --- /dev/null +++ b/packages/gpe-nmf/gpe-nmf-0.22/fix-includepath.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- gpe-nmf-0.22/Makefile~fix-includepath ++++ gpe-nmf-0.22/Makefile +@@ -27,7 +27,6 @@ + PACKAGE_LDFLAGS += -L../libgpewidget + BUILD = ../build + else +-PACKAGE_CFLAGS += -I/usr/include/gpe + BUILD = build + endif + PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLDFLAGS) diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb index d90c42435b..c4b2ae7c2c 100644 --- a/packages/gpe-nmf/gpe-nmf_0.22.bb +++ b/packages/gpe-nmf/gpe-nmf_0.22.bb @@ -17,11 +17,12 @@ RRECOMMENDS = "gst-plugin-mad \ gst-plugin-ivorbis \ gst-plugin-tcp" -SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0" +SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0 \ + file://fix-includepath.patch;patch=1" SECTION = "gpe" PRIORITY = "optional" -PR = "r1" +PR = "r2" PARALLEL_MAKE="" |