diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-08-13 18:32:20 +0000 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-08-13 18:32:20 +0000 |
| commit | 179b81f5a05fc355e125d0eb64892e198d39c7ca (patch) | |
| tree | 899b462f90a6f6b4c672d1a6667da6818e67aeba | |
| parent | 0706ccdb1ad9bf399f08927096900d210aa60037 (diff) | |
| parent | 017fb6a47074e7b833e2de829fc108971bc31a95 (diff) | |
merge of '42fa696a594e3a4b211f213594277acc96fef947'
and '7a6ef70c33357e83223926dab560ae66d6f41c7c'
| -rw-r--r-- | packages/libchm/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libchm/chmlib_0.38.bb | 11 | ||||
| -rw-r--r-- | packages/libchm/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libchm/files/arm-guess.patch | 12 | ||||
| -rw-r--r-- | packages/mikmod/mikmod_3.2.2-beta1.bb | 2 | ||||
| -rw-r--r-- | packages/xmms/xmms_1.2.10.bb | 2 |
6 files changed, 25 insertions, 2 deletions
diff --git a/packages/libchm/.mtn2git_empty b/packages/libchm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libchm/.mtn2git_empty diff --git a/packages/libchm/chmlib_0.38.bb b/packages/libchm/chmlib_0.38.bb new file mode 100644 index 0000000000..4b44b7ce57 --- /dev/null +++ b/packages/libchm/chmlib_0.38.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." +LICENSE = "GPLv2" +HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/" + +SRC_URI = "http://66.93.236.84/~jedwin/projects/chmlib/${P}.tar.bz2 \ + file://arm-guess.patch;patch=1" + +inherit autotools pkgconfig + + + diff --git a/packages/libchm/files/.mtn2git_empty b/packages/libchm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libchm/files/.mtn2git_empty diff --git a/packages/libchm/files/arm-guess.patch b/packages/libchm/files/arm-guess.patch new file mode 100644 index 0000000000..b524c81aac --- /dev/null +++ b/packages/libchm/files/arm-guess.patch @@ -0,0 +1,12 @@ +--- /tmp/chm_lib.c 2006-08-13 12:29:15.000000000 +0200 ++++ chmlib-0.38/src/chm_lib.c 2006-08-13 12:29:43.148306000 +0200 +@@ -160,7 +160,8 @@ + /* Sparc */ + /* MIPS */ + /* PPC */ +-#elif __i386__ || __sun || __sgi || __ppc__ ++/* ARM */ ++#elif __i386__ || __sun || __sgi || __ppc__ || __arm__ + typedef unsigned char UChar; + typedef short Int16; + typedef unsigned short UInt16; diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb index 79146fb580..76acab9f64 100644 --- a/packages/mikmod/mikmod_3.2.2-beta1.bb +++ b/packages/mikmod/mikmod_3.2.2-beta1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A module player based on libmikmod." SECTION = "console/multimedia" HOMEPAGE = "http://mikmod.raphnet.net" MAINTAINER = "Michael 'Mickey' Lauer" -DEPENDS = "libmikmod" +DEPENDS = "ncurses libmikmod" PR = "r1" LICENSE = "GPL" SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \ diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 5f50534cf5..e4fa21e4f3 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -22,7 +22,7 @@ EXTRA_OECONF = "--disable-opengl --disable-esd \ do_configure_prepend() { cp ${WORKDIR}/acinclude.m4 ${S} - rm ${S}/libxmms/acinclude.m4 + rm ${S}/libxmms/acinclude.m4 || true } do_stage() { |