diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-09-07 16:32:05 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-09-07 16:32:05 +0000 |
| commit | 52b9d76ca05a6eb842624b728eed64f3b32b3f4a (patch) | |
| tree | ac65d774f5b867e354cd7b92b8d6044709945532 | |
| parent | 74a4862848d8d17d69c97f8f370c2261bd10b3b0 (diff) | |
| parent | 6f5ad23ff4f0e08383a18355330ceb7b2f79f4a6 (diff) | |
merge of 0a9ecefe53a365e158ea60774a322f0f6c3557b4
and 2febf377486cc323b811be579e1fd1a7d891cee6
| -rw-r--r-- | packages/gimp/gimp_2.3.10.bb | 30 | ||||
| -rw-r--r-- | packages/openocd/openocd_svn.bb | 4 |
2 files changed, 18 insertions, 16 deletions
diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index eb760ec9d8..f28ff7d52d 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -1,23 +1,23 @@ -DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." -HOMEPAGE = "http://www.gimp.org" -LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" +DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." +HOMEPAGE = "http://www.gimp.org" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" +LICENSE = "GPL" -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ - file://configure-libwmf.patch;patch=1" - -DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" +DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" -DEFAULT_PREFERENCE = "-1" +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ + file://configure-libwmf.patch;patch=1" inherit autotools pkgconfig + #Don't laugh, this just builds a threaded gimp -EXTRA_OECONF = " --disable-gtktest \ - --disable-print \ - --disable-python \ - --enable-mp \ - --without-libwmf" +EXTRA_OECONF = " --disable-gtktest \ + --disable-print \ + --disable-python \ + --enable-mp \ + --without-libwmf" do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } + diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 2652e15eae..26ab365b0e 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -2,11 +2,13 @@ HOMEPAGE = "http://openocd.berlios.de/" DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" LICENSE = "GPL" +PV = "0.0+svn${SRCDATE}" + inherit autotools SRC_URI = "svn://svn.berlios.de/;module=${PN}" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/${PN}/trunk" EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx" |