diff options
| -rw-r--r-- | packages/guile/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/guile/files/configure-lossage.patch (renamed from packages/guile/configure-lossage.patch) | 0 | ||||
| -rw-r--r-- | packages/guile/files/gcc4.patch | 16 | ||||
| -rw-r--r-- | packages/guile/guile_1.6.4.bb | 14 | ||||
| -rw-r--r-- | packages/samba/samba-essential_3.0.20.bb | 4 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.6.1b.bb | 3 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.9.0.bb | 2 |
7 files changed, 32 insertions, 7 deletions
diff --git a/packages/guile/files/.mtn2git_empty b/packages/guile/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/guile/files/.mtn2git_empty diff --git a/packages/guile/configure-lossage.patch b/packages/guile/files/configure-lossage.patch index da1d0de6e7..da1d0de6e7 100644 --- a/packages/guile/configure-lossage.patch +++ b/packages/guile/files/configure-lossage.patch diff --git a/packages/guile/files/gcc4.patch b/packages/guile/files/gcc4.patch new file mode 100644 index 0000000000..2168683ad5 --- /dev/null +++ b/packages/guile/files/gcc4.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- guile-1.6.4/libguile/guile.c~gcc4 ++++ guile-1.6.4/libguile/guile.c +@@ -88,7 +88,7 @@ + { + #ifdef DYNAMIC_LINKING + /* libtool automagically inserts this variable into your executable... */ +- extern const scm_lt_dlsymlist lt_preloaded_symbols[]; ++ extern const scm_lt_dlsymlist *lt_preloaded_symbols; + scm_lt_dlpreload_default (lt_preloaded_symbols); + #endif + scm_boot_guile (argc, argv, inner_main, 0); diff --git a/packages/guile/guile_1.6.4.bb b/packages/guile/guile_1.6.4.bb index dc55c266a0..389aec9489 100644 --- a/packages/guile/guile_1.6.4.bb +++ b/packages/guile/guile_1.6.4.bb @@ -1,9 +1,15 @@ -SECTION = "unknown" -LICENSE = "GPL" +DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \ +packaged as a library which can be incorporated into your programs." +HOMEPAGE = "http://www.gnu.org/software/guile/guile.html" +SECTION = "devel/scheme" +DEPENDS = "guile-native" MAINTAINER = "Phil Blundell <pb@handhelds.org>" +LICENSE = "GPL" +PR = "r1" + SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ - file://configure-lossage.patch;patch=1" -DEPENDS = "guile-native" + file://configure-lossage.patch;patch=1 \ + file://gcc4.patch;patch=1" inherit autotools diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb index 50d4e432e5..4cee9541bd 100644 --- a/packages/samba/samba-essential_3.0.20.bb +++ b/packages/samba/samba-essential_3.0.20.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -42,6 +42,8 @@ do_install_append() { rm -f ${D}/sbin/mount.smbfs rmdir ${D}/sbin install -d "${D}${sysconfdir}/init.d" + install -d "${D}${sysconfdir}/samba/private" + install -c -m 755 ${WORKDIR}/init-essential ${D}${sysconfdir}/init.d/samba install -d "${D}${sysconfdir}/samba" diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index a2c0459b3e..313737bc92 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -3,7 +3,8 @@ DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" SRC_URI += " file://mouse.patch;patch=1 \ file://gcc-4.x.x-accept.patch;patch=1 \ file://sh3-linux-new-arch.patch;patch=1 \ - file://tail-obselete-fix.patch;patch=1" + file://tail-obselete-fix.patch;patch=1 \ + file://tremor.patch;patch=1" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb index fd89e8fa1c..2f8e9382bb 100644 --- a/packages/scummvm/scummvm_0.9.0.bb +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -1,5 +1,5 @@ include scummvm.inc -DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2" SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" do_compile() { |