[oe-commits] org.oe.dev merge of '0db5a631daed7a2002855bd39af92ef174a28037'
oe commit
openembedded-commits at lists.openembedded.org
Sun Aug 26 10:17:10 UTC 2007
merge of '0db5a631daed7a2002855bd39af92ef174a28037'
and 'fd42dbc3f52d856f1d5210791ff3fc2be2bc2749'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 1eb402d65c65c017f7fabfc389de63084c25dfc6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1eb402d65c65c017f7fabfc389de63084c25dfc6
Files:
1
packages/gnome/libsoup_2.2.98.bb
packages/gnome/libsoup_2.2.100.bb
packages/libspiff
packages/libspiff/files
packages/liburiparser
packages/liburiparser/files
packages/openmoko2/openmoko-mediaplayer2
conf/machine/include/tune-x86-nocona.conf
conf/machine/x86-32-nocona.conf
packages/libspiff/files/autofoo.patch
packages/libspiff/libspiff_0.7.2.bb
packages/liburiparser/files/autofoo.patch
packages/liburiparser/liburiparser_0.5.1.bb
packages/openmoko2/openmoko-mediaplayer2/autofoo.patch
packages/openmoko2/openmoko-mediaplayer2/missing-images.patch
packages/openmoko2/openmoko-mediaplayer2_svn.bb
conf/machine/x86-prescott.conf
packages/images/helloworld-image.bb
packages/linux/linux.inc
packages/gimp/gimp.inc
packages/gimp/gimp_2.3.19.bb
packages/gimp/gimp_2.2.10.bb
packages/gimp/gimp_2.3.10.bb
packages/gimp/gimp_2.3.7.bb
packages/gimp/gimp_2.3.8.bb
Diffs:
#
# mt diff -r0db5a631daed7a2002855bd39af92ef174a28037 -r1eb402d65c65c017f7fabfc389de63084c25dfc6
#
#
#
# rename "packages/gnome/libsoup_2.2.98.bb"
# to "packages/gnome/libsoup_2.2.100.bb"
#
# add_dir "packages/libspiff"
#
# add_dir "packages/libspiff/files"
#
# add_dir "packages/liburiparser"
#
# add_dir "packages/liburiparser/files"
#
# add_dir "packages/openmoko2/openmoko-mediaplayer2"
#
# add_file "conf/machine/include/tune-x86-nocona.conf"
# content [e3055e1b7d16571baa2b5057e57bea5bafce0eff]
#
# add_file "conf/machine/x86-32-nocona.conf"
# content [b522dc4b9b621d931cd9f477e2bcf5a9797b1184]
#
# add_file "packages/libspiff/files/autofoo.patch"
# content [7f9c81a548b9ebb333e7bc7e2031d731483b3377]
#
# add_file "packages/libspiff/libspiff_0.7.2.bb"
# content [ef70730dd8ab4a23e03e830936613c707dbc2ec9]
#
# add_file "packages/liburiparser/files/autofoo.patch"
# content [39dede97db097f7a997d5ee9abac8c2e12f9a5f4]
#
# add_file "packages/liburiparser/liburiparser_0.5.1.bb"
# content [3cb05d7529e2f1f4f5b93c72efade949c73cbd5f]
#
# add_file "packages/openmoko2/openmoko-mediaplayer2/autofoo.patch"
# content [35f24d6a1124f6f003e9c363b1eaba5df6dc1990]
#
# add_file "packages/openmoko2/openmoko-mediaplayer2/missing-images.patch"
# content [77904ad441581958fac3b66e0a2e8d329d89da7e]
#
# add_file "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
# content [84f7b52cde34d39d88f37e49b600cd1da90c9ee8]
#
# patch "conf/machine/x86-prescott.conf"
# from [b8d329ec5b9571027699938a2c508f2cbe3b7859]
# to [4dfd059cbf58a8516ce7da5aac28fa268f23eb8e]
#
# patch "packages/gnome/libsoup_2.2.100.bb"
# from [f25cbdad99a05dd98331cd9a1a4792ae7661ef25]
# to [42622e2e11666cee24fce98545e6b2ececc58a0d]
#
# patch "packages/images/helloworld-image.bb"
# from [9af31161384a1629809fec960cae7439f031a632]
# to [62d0dfb6cdd494db5b4731b74f5f3a4a92f0a119]
#
# patch "packages/linux/linux.inc"
# from [dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02]
# to [acd09fd5582e642f6a65a35eceb99a809355eb33]
#
============================================================
--- conf/machine/include/tune-x86-nocona.conf e3055e1b7d16571baa2b5057e57bea5bafce0eff
+++ conf/machine/include/tune-x86-nocona.conf e3055e1b7d16571baa2b5057e57bea5bafce0eff
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"
============================================================
--- conf/machine/x86-32-nocona.conf b522dc4b9b621d931cd9f477e2bcf5a9797b1184
+++ conf/machine/x86-32-nocona.conf b522dc4b9b621d931cd9f477e2bcf5a9797b1184
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: x86-nocona
+#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode
+#
+
+TARGET_ARCH = "i686"
+MACHINE_ARCH = "x86-32-nocona"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
+
+require conf/machine/include/tune-x86-nocona.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.20"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
============================================================
--- packages/libspiff/files/autofoo.patch 7f9c81a548b9ebb333e7bc7e2031d731483b3377
+++ packages/libspiff/files/autofoo.patch 7f9c81a548b9ebb333e7bc7e2031d731483b3377
@@ -0,0 +1,31 @@
+Index: libspiff-0.7.2/configure.in
+===================================================================
+--- libspiff-0.7.2.orig/configure.in 2007-08-25 15:47:29.000000000 +0000
++++ libspiff-0.7.2/configure.in 2007-08-25 15:47:48.000000000 +0000
+@@ -78,26 +78,6 @@
+ LDFLAGS="-L${withval} ${LDFLAGS}"
+ ], [])
+
+-
+-
+-# Local headers must come very first. Otherwise we
+-# risk including headers of an already installed
+-# libSpiff version if its path is in CPPFLAGS
+-CPPFLAGS="-Iinclude ${CPPFLAGS}"
+-
+-
+-
+-# Append $prefix as a fallback at the very end
+-if test "x${prefix}" != "xNONE"; then
+- WORKING_PREFIX=${prefix}
+-else
+- WORKING_PREFIX=${ac_default_prefix}
+-fi
+-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
+-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
+-
+-
+-
+ # Check presence
+ EXPAT_MISSING="Please install libexpat 1.95.8 or later.
+ On Ubuntu enter 'sudo apt-get install libexpat-dev'."
============================================================
--- packages/libspiff/libspiff_0.7.2.bb ef70730dd8ab4a23e03e830936613c707dbc2ec9
+++ packages/libspiff/libspiff_0.7.2.bb ef70730dd8ab4a23e03e830936613c707dbc2ec9
@@ -0,0 +1,23 @@
+DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application."
+HOMEPAGE = "http://libspiff.sf.net"
+SECTION = "libs"
+LICENSE = "BSD"
+DEPENDS = "expat liburiparser"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libspiff-${PV}"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "\
+ --with-expat=${STAGING_LIBDIR}/.. \
+ --with-uriparser=${STAGING_LIBDIR}/.. \
+"
+
+CPPFLAGS += "-I${S}/include"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/liburiparser/files/autofoo.patch 39dede97db097f7a997d5ee9abac8c2e12f9a5f4
+++ packages/liburiparser/files/autofoo.patch 39dede97db097f7a997d5ee9abac8c2e12f9a5f4
@@ -0,0 +1,21 @@
+Index: uriparser-0.5.1/configure.in
+===================================================================
+--- uriparser-0.5.1.orig/configure.in 2007-08-25 15:32:52.000000000 +0000
++++ uriparser-0.5.1/configure.in 2007-08-25 15:34:56.000000000 +0000
+@@ -2,7 +2,7 @@
+ AC_INIT([uriparser], [0.5.1])
+ AM_INIT_AUTOMAKE([1.9 foreign])
+ AM_CONFIG_HEADER(test/CppTest/config.h)
+-
++AM_PROG_CC_C_O
+
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -10,7 +10,6 @@
+ AC_HEADER_STDC
+
+
+-
+ # URI_SIZEDOWN
+ AC_ARG_ENABLE(sizedown, [
+ Extra options:
============================================================
--- packages/liburiparser/liburiparser_0.5.1.bb 3cb05d7529e2f1f4f5b93c72efade949c73cbd5f
+++ packages/liburiparser/liburiparser_0.5.1.bb 3cb05d7529e2f1f4f5b93c72efade949c73cbd5f
@@ -0,0 +1,15 @@
+DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library."
+HOMEPAGE = "http://uriparser.sf.net"
+SECTION = "libs"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/uriparser-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/openmoko2/openmoko-mediaplayer2/autofoo.patch 35f24d6a1124f6f003e9c363b1eaba5df6dc1990
+++ packages/openmoko2/openmoko-mediaplayer2/autofoo.patch 35f24d6a1124f6f003e9c363b1eaba5df6dc1990
@@ -0,0 +1,38 @@
+Index: openmoko-mediaplayer2/configure.ac
+===================================================================
+--- openmoko-mediaplayer2.orig/configure.ac 2007-08-25 16:05:09.000000000 +0000
++++ openmoko-mediaplayer2/configure.ac 2007-08-25 16:05:28.000000000 +0000
+@@ -14,12 +14,6 @@
+ AM_GNU_GETTEXT
+ AM_GNU_GETTEXT_VERSION([0.12.1])
+
+-
+-CFLAGS="-I${prefix}/include $CFLAGS"
+-AC_SUBST(CFLAGS)
+-CPPFLAGS="-I${prefix}/include $CPPFLAGS"
+-AC_SUBST(CPPFLAGS)
+-
+ # Check for GTK/GLib/GThread/Pango, dbus, OpenMoko libs, gstreamer, expat, uriparser and XSPF
+
+ PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0 gthread-2.0 pango],,
+@@ -61,7 +55,5 @@
+ Makefile
+ src/Makefile
+ images/Makefile
+- po/Makefile.in
+- intl/Makefile
+ ])
+ AC_OUTPUT
+Index: openmoko-mediaplayer2/Makefile.am
+===================================================================
+--- openmoko-mediaplayer2.orig/Makefile.am 2007-08-25 16:07:46.000000000 +0000
++++ openmoko-mediaplayer2/Makefile.am 2007-08-25 16:07:53.000000000 +0000
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = src images intl
+-# po
++SUBDIRS = src images
++# po intl
+
+
+ EXTRA_DIST = openmoko-mediaplayer.desktop openmoko-mediaplayer.png
============================================================
--- packages/openmoko2/openmoko-mediaplayer2/missing-images.patch 77904ad441581958fac3b66e0a2e8d329d89da7e
+++ packages/openmoko2/openmoko-mediaplayer2/missing-images.patch 77904ad441581958fac3b66e0a2e8d329d89da7e
@@ -0,0 +1,13 @@
+Index: openmoko-mediaplayer2/images/Makefile.am
+===================================================================
+--- openmoko-mediaplayer2.orig/images/Makefile.am 2007-08-25 16:15:27.000000000 +0000
++++ openmoko-mediaplayer2/images/Makefile.am 2007-08-25 16:15:35.000000000 +0000
+@@ -12,8 +12,6 @@
+ ico-repeat-all.png \
+ ico-shuffle-on.png \
+ ico-shuffle-off.png \
+- ico-balance-left.png \
+- ico-balance-right.png \
+ ico-tracktype-general.png \
+ ind-music-eq-00.png \
+ ind-music-eq-01.png \
============================================================
--- packages/openmoko2/openmoko-mediaplayer2_svn.bb 84f7b52cde34d39d88f37e49b600cd1da90c9ee8
+++ packages/openmoko2/openmoko-mediaplayer2_svn.bb 84f7b52cde34d39d88f37e49b600cd1da90c9ee8
@@ -0,0 +1,12 @@
+DESCRIPTION = "A media player for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2 expat gstreamer libspiff"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI += "\
+ file://autofoo.patch;patch=1 \
+ file://missing-images.patch;patch=1 \
+"
============================================================
--- conf/machine/x86-prescott.conf b8d329ec5b9571027699938a2c508f2cbe3b7859
+++ conf/machine/x86-prescott.conf 4dfd059cbf58a8516ce7da5aac28fa268f23eb8e
@@ -1,9 +1,9 @@ TARGET_ARCH = "i686"
#@TYPE: Machine
#@NAME: x86-prescott
#@DESCRIPTION: Machine configuration for a generic i686 machine
TARGET_ARCH = "i686"
-PACKAGE_ARCH = "x86-prescott"
+MACHINE_ARCH = "x86-prescott"
PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
require conf/machine/include/tune-x86-prescott.conf
============================================================
--- packages/gnome/libsoup_2.2.98.bb f25cbdad99a05dd98331cd9a1a4792ae7661ef25
+++ packages/gnome/libsoup_2.2.100.bb 42622e2e11666cee24fce98545e6b2ececc58a0d
@@ -1,19 +1,18 @@ SECTION = "x11/gnome/libs"
DESCRIPTION = "An HTTP library implementation in C"
LICENSE = "GPL"
SECTION = "x11/gnome/libs"
-
DEPENDS = "glib-2.0 gnutls libxml2"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
inherit autotools pkgconfig
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir}/ ${libdir}/"
-FILES_${PN}-doc = "${datadir}/"
-
do_stage() {
rm -f ${PKG_CONFIG_PATH}/libsoup*
autotools_stage_all
ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc
}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
============================================================
--- packages/images/helloworld-image.bb 9af31161384a1629809fec960cae7439f031a632
+++ packages/images/helloworld-image.bb 62d0dfb6cdd494db5b4731b74f5f3a4a92f0a119
@@ -11,18 +11,3 @@ inherit image
PACKAGE_INSTALL = ${RDEPENDS}
inherit image
-
-# Hello world image
-# Contains *only* a statically linked hello world init program
-LICENSE = "MIT"
-PR = "r0"
-
-RDEPENDS = "helloworld"
-
-export IMAGE_BASENAME = "helloworld-image"
-export IMAGE_LINGUAS = ""
-
-PACKAGE_INSTALL = ${RDEPENDS}
-
-inherit image
-
============================================================
--- packages/linux/linux.inc dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02
+++ packages/linux/linux.inc acd09fd5582e642f6a65a35eceb99a809355eb33
@@ -64,7 +64,7 @@ do_deploy() {
${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
- uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+ uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
rm -f linux.bin.gz
fi
}
#
# mt diff -rfd42dbc3f52d856f1d5210791ff3fc2be2bc2749 -r1eb402d65c65c017f7fabfc389de63084c25dfc6
#
#
#
# add_file "packages/gimp/gimp.inc"
# content [e57e9874a5da57b97e12d50c9ee4d615f3329bb2]
#
# add_file "packages/gimp/gimp_2.3.19.bb"
# content [ec38ec44622b7abfcc1305f6297cb1ebc9fce156]
#
# patch "packages/gimp/gimp_2.2.10.bb"
# from [9660e5e4d735fbd979368680c33c9b2c0d97ead0]
# to [818b7b89ebb9ff79ccd0a3831f4b5ea293e459dd]
#
# patch "packages/gimp/gimp_2.3.10.bb"
# from [4d162357dd39d36f2015b0c347cf9f836ca0a059]
# to [88a30520116f72eee4fec415c02b4cfb382d6ad3]
#
# patch "packages/gimp/gimp_2.3.7.bb"
# from [f222b714a4ed64a62131d19bfc80923cf5d2b838]
# to [93a9d2d27856f5b1f3fe13a84479f3cd910755ad]
#
# patch "packages/gimp/gimp_2.3.8.bb"
# from [e1e9b4eb4b2aa80b2da934c5d49a8dd0ac6282f8]
# to [93a9d2d27856f5b1f3fe13a84479f3cd910755ad]
#
============================================================
--- packages/gimp/gimp.inc e57e9874a5da57b97e12d50c9ee4d615f3329bb2
+++ packages/gimp/gimp.inc e57e9874a5da57b97e12d50c9ee4d615f3329bb2
@@ -0,0 +1,38 @@
+DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "x11/graphics"
+LICENSE = "GPL"
+
+DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
+ file://configure-libwmf.patch;patch=1"
+
+inherit autotools pkgconfig
+
+FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
+ ${libdir}/gimp/2.0/plug-ins/.debug"
+
+#Don't laugh, this just builds a threaded gimp
+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
+}
+
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/icons \
+ ${datadir}/mime-info \
+ ${datadir}/application-registry "
+
+FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
+ ${libdir}/gimp/2.0/modules/.debug"
+
============================================================
--- packages/gimp/gimp_2.3.19.bb ec38ec44622b7abfcc1305f6297cb1ebc9fce156
+++ packages/gimp/gimp_2.3.19.bb ec38ec44622b7abfcc1305f6297cb1ebc9fce156
@@ -0,0 +1,2 @@
+require gimp.inc
+
============================================================
--- packages/gimp/gimp_2.2.10.bb 9660e5e4d735fbd979368680c33c9b2c0d97ead0
+++ packages/gimp/gimp_2.2.10.bb 818b7b89ebb9ff79ccd0a3831f4b5ea293e459dd
@@ -1,21 +1,4 @@
-DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL"
+require gimp.inc
PR = "r1"
-SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2"
-DEPENDS = "gtk+ jpeg libpng libexif"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = " --disable-gtktest \
- --without-libtiff \
- --disable-print \
- --enable-mp"
-
-do_configure_append() {
- find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
-
============================================================
--- packages/gimp/gimp_2.3.10.bb 4d162357dd39d36f2015b0c347cf9f836ca0a059
+++ packages/gimp/gimp_2.3.10.bb 88a30520116f72eee4fec415c02b4cfb382d6ad3
@@ -1,35 +1,3 @@
-DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL"
-PR = "r2"
+require gimp.inc
+PR = "r3"
-DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
- file://configure-libwmf.patch;patch=1"
-
-inherit autotools pkgconfig
-
-FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
- ${libdir}/gimp/2.0/plug-ins/.debug"
-
-#Don't laugh, this just builds a threaded gimp
-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
-}
-
-
-FILES_${PN} += "${datadir}/icons \
- ${datadir}/mime-info \
- ${datadir}/application-registry "
-
-FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
- ${libdir}/gimp/2.0/modules/.debug"
-
============================================================
--- packages/gimp/gimp_2.3.7.bb f222b714a4ed64a62131d19bfc80923cf5d2b838
+++ packages/gimp/gimp_2.3.7.bb 93a9d2d27856f5b1f3fe13a84479f3cd910755ad
@@ -1,20 +1,2 @@
-DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL"
+require gimp.inc
PR = "r1"
-
-SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
-
-DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-EXTRA_OECONF = " --disable-gtktest \
- --disable-print \
- --disable-python \
- --enable-mp"
-
-do_configure_append() {
- find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
============================================================
--- packages/gimp/gimp_2.3.8.bb e1e9b4eb4b2aa80b2da934c5d49a8dd0ac6282f8
+++ packages/gimp/gimp_2.3.8.bb 93a9d2d27856f5b1f3fe13a84479f3cd910755ad
@@ -1,22 +1,2 @@
-DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL"
+require gimp.inc
PR = "r1"
-
-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"
-
-inherit autotools pkgconfig
-#Don't laugh, this just builds a threaded gimp
-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
-}
More information about the Openembedded-commits
mailing list