diff options
| -rw-r--r-- | packages/espgs/espgs-native_7.07.1rc1.bb | 11 | ||||
| -rw-r--r-- | packages/espgs/espgs_7.07.1.bb (renamed from packages/espgs/espgs_7.07.1rc1.bb) | 17 | ||||
| -rw-r--r-- | packages/evince/evince_0.3.2.bb | 2 | ||||
| -rw-r--r-- | packages/gpsdrive/gpsdrive_2.10pre3.bb | 2 | ||||
| -rw-r--r-- | packages/perl/perl_5.8.7.bb | 1 | ||||
| -rw-r--r-- | packages/scummvm/scummvm.inc | 3 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.6.1b.bb | 1 |
7 files changed, 15 insertions, 22 deletions
diff --git a/packages/espgs/espgs-native_7.07.1rc1.bb b/packages/espgs/espgs-native_7.07.1rc1.bb deleted file mode 100644 index 04581f6bab..0000000000 --- a/packages/espgs/espgs-native_7.07.1rc1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "unknown" -include espgs_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/espgs-${PV}" -DEPENDS = "jpeg-native zlib-native libpng-native" - -PARALLEL_MAKE="" - -do_stage_append () { - install -m 0755 obj/echogs obj/genarch obj/genconf ${STAGING_BINDIR}/ -} diff --git a/packages/espgs/espgs_7.07.1rc1.bb b/packages/espgs/espgs_7.07.1.bb index 9d7d9c2fd1..b6f422fb03 100644 --- a/packages/espgs/espgs_7.07.1rc1.bb +++ b/packages/espgs/espgs_7.07.1.bb @@ -1,11 +1,14 @@ -SECTION = "unknown" -DEPENDS = "jpeg zlib libpng espgs-native" +DESCRIPTION = "ESP Ghostscript is an up-to-date GNU Ghostscript distribution \ +including bug fixes, new drivers, and additional support for CUPS." +HOMEPAGE = "http://espgs.sf.net" +SECTION = "libs" +DEPENDS = "jpeg zlib libpng" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/espgs/espgs-${PV}-source.tar.bz2" S = "${WORKDIR}/espgs-${PV}" -PARALLEL_MAKE="" +PARALLEL_MAKE = "" inherit autotools @@ -15,10 +18,10 @@ EXTRA_OECONF = "--with-drivers= \ --without-omni \ --without-x \ --disable-cups" -EXTRA_OEMAKE = "'BUILD_TIME_GS=${STAGING_BINDIR}/gs' \ - 'ECHOGS_XE=${STAGING_BINDIR}/echogs' \ - 'GENARCH_XE=${STAGING_BINDIR}/genarch' \ - 'GENCONF_XE=${STAGING_BINDIR}/genconf'" + +do_compile() { + oe_runmake CCAUX="${BUILD_CC}" +} do_install () { oe_runmake 'prefix=${D}${prefix}' \ diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb index 905ce519b8..86ca664655 100644 --- a/packages/evince/evince_0.3.2.bb +++ b/packages/evince/evince_0.3.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Evince is simply a document viewer" LICENSE = "GPL" -DEPENDS = "tiff espgs-native espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" +DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs" RRECOMMENDS = "gnome-vfs-plugin-file" diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb index 0dc0bdbe7d..7d0e32930c 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre3.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb @@ -1,6 +1,6 @@ inherit autotools pkgconfig -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index b5d25257bb..250c306743 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -1,4 +1,5 @@ MAINTAINER="David Karlstrom <daka@thg.se>" +DEFAULT_PREFERENCE="-1" include perl.inc diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 491dfca9dc..88c6f13d9d 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -4,8 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ - file://tremor.patch;patch=1 \ - file://mouse.patch;patch=1 " + file://tremor.patch;patch=1" inherit autotools diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index 8e70acef68..6f805b6b4d 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,5 +1,6 @@ include scummvm.inc DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +SRC_URI += " file://mouse.patch;patch=1 " do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ |