diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-07-09 16:29:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-09 16:29:38 +0000 |
| commit | 965b805b451106d6a5e41e0fe8fb3847b4dddd29 (patch) | |
| tree | 418d03e54bd5490b8fc3ffc7da3a61c7be6f2347 /packages | |
| parent | ce85bae0ffbca430dd50976c0b5397b3a822b6f7 (diff) | |
| parent | b10227fbeee14a88de96acaa9b4e3f3042de5b30 (diff) | |
merge of 741270052fa677010603209da3adb0f5194af3ef
and 8b65cbd401e1f926a05aed4038504520748a6824
Diffstat (limited to 'packages')
287 files changed, 1266 insertions, 675 deletions
diff --git a/packages/abiword/abiword_2.0.14.bb b/packages/abiword/abiword_2.0.14.bb index d7b0ab507b..2b17edb4d8 100644 --- a/packages/abiword/abiword_2.0.14.bb +++ b/packages/abiword/abiword_2.0.14.bb @@ -4,7 +4,7 @@ DEPENDS = "cdump-native libfribidi enchant jpeg libpng perl glibc" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -BROKEN =1 +BROKEN = "1" inherit autotools PR = "r0" @@ -13,7 +13,7 @@ S = "${WORKDIR}/abiword-${PV}/abi" SRC_URI = "http://download.sourceforge.net/abiword/abiword-${PV}.tar.bz2" -FILES_${PN} += " ${datadir}/icons/* \ +FILES_${PN} += "${datadir}/icons/* \ ${datadir}/AbiSuite-2.0/AbiWord/glade \ ${datadir}/AbiSuite-2.0/AbiWord/scripts \ ${datadir}/AbiSuite-2.0/AbiWord/system.profile-en \ @@ -21,7 +21,7 @@ ${datadir}/AbiSuite-2.0/AbiWord/system.profile-en_GB \ #${datadir}/AbiSuite-2.0/templates/A4.awt \ #${datadir}/AbiSuite-2.0/templates/US-Letter.awt \ ${datadir}/AbiSuite-2.0/templates/normal.awt \ -${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \ +${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \ ${datadir}/AbiSuite-2.0/templates/Employee-Directory.awt \ ${datadir}/AbiSuite-2.0/templates/Business-Report.awt \ ${datadir}/AbiSuite-2.0/templates/Fax-Coversheet.awt \ @@ -31,7 +31,7 @@ ${datadir}/AbiSuite-2.0/templates/Memo.awt \ ${datadir}/AbiSuite-2.0/templates/Press-Release.awt" #abiword needs this native tool -export BUILD_CDUMPTOOL=${STAGING_BINDIR}/cdump +export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump" PARALLEL_MAKE="" diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb index ac96afc9d9..58098b797f 100644 --- a/packages/abiword/abiword_2.2.7.bb +++ b/packages/abiword/abiword_2.2.7.bb @@ -32,7 +32,7 @@ ${datadir}/AbiSuite-2.2/templates/Press-Release.awt " inherit autotools #abiword needs this native tool -export BUILD_CDUMPTOOL=${STAGING_BINDIR}/cdump +export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump" PARALLEL_MAKE="" diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index e798f6321b..5a6d04f0e3 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -53,4 +53,4 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" RDEPENDS_alsa-utils += "${ALSA_PACKAGES}" -ALLOW_EMPTY_alsa-utils = 1 +ALLOW_EMPTY_alsa-utils = "1" diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index f7280122b9..9673e5fb1b 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -7,8 +7,8 @@ PV = "0.0cvs${CVSDATE}" inherit module -MODULES = at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \ - at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o +MODULES = "at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \ + at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o" pkg_postinst() { #!/bin/sh diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 4ca12c7aab..ee691a9560 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -21,7 +21,7 @@ SRC_URI = " \ file://licenses/GPL-2 \ file://licenses/LGPL-2 \ file://licenses/LGPL-2.1 \ - file://licenses/Artistic " + file://licenses/Artistic " S = "${WORKDIR}" docdir_append = "/${P}" @@ -38,7 +38,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${localstatedir}/lock/subsys ${localstatedir}/log \ ${localstatedir}/run ${localstatedir}/spool \ /mnt /media /media/card /media/cf /media/net /media/ram \ - /media/union /media/realroot /media/hdd \ + /media/union /media/realroot /media/hdd \ /media/mmc1" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ @@ -170,7 +170,7 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" # Unslung distribution specific packages follow ... -PACKAGES_unslung = ${PN}-unslung +PACKAGES_unslung = "${PN}-unslung" PACKAGE_ARCH_${PN}-unslung = "nslu2" MAINTAINER_${PN}-unslung = "NSLU2 Linux <www.nslu2-linux.org>" RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk" diff --git a/packages/base-passwd/base-passwd-3.5.9/mysql.patch b/packages/base-passwd/base-passwd-3.5.9/mysql.patch new file mode 100644 index 0000000000..b641f41238 --- /dev/null +++ b/packages/base-passwd/base-passwd-3.5.9/mysql.patch @@ -0,0 +1,8 @@ +--- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200 ++++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200 +@@ -36,4 +36,5 @@ + staff:*:50: + games:*:60: + users:*:100: ++mysql:*:64001: + nogroup:*:65534: diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch index 33e2f8b4f6..346f144193 100644 --- a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch +++ b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch @@ -1,14 +1,15 @@ ---- base-passwd/passwd.master.orig 2005-03-21 10:16:56.000000000 +0100 -+++ base-passwd/passwd.master 2005-03-21 10:17:04.000000000 +0100 +--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 ++++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 @@ -1,4 +1,4 @@ -root::0:0:root:/root:/bin/sh +root:Xm./49bYkrkuo:0:0:root:/home/root:/bin/sh daemon:*:1:1:daemon:/usr/sbin:/bin/sh bin:*:2:2:bin:/bin:/bin/sh sys:*:3:3:sys:/dev:/bin/sh -@@ -15,4 +15,5 @@ +@@ -15,4 +15,6 @@ list:*:38:38:Mailing List Manager:/var/list:/bin/sh irc:*:39:39:ircd:/var/run/ircd:/bin/sh gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh +ntpd:*:47:65534:OpenNTPd daemon:/var/shared/empty:/dev/null ++mysql:*:64001:64001:MySQL daemon:/var/mysql:/dev/null nobody:*:65534:65534:nobody:/nonexistent:/bin/sh diff --git a/packages/base-passwd/base-passwd-3.5.9/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/root-home.patch index d223d49193..dd439efb18 100644 --- a/packages/base-passwd/base-passwd-3.5.9/root-home.patch +++ b/packages/base-passwd/base-passwd-3.5.9/root-home.patch @@ -1,14 +1,15 @@ ---- base-passwd/passwd.master.orig 2005-03-21 10:16:56.000000000 +0100 -+++ base-passwd/passwd.master 2005-03-21 10:17:04.000000000 +0100 +--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 ++++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 @@ -1,4 +1,4 @@ -root::0:0:root:/root:/bin/sh +root::0:0:root:/home/root:/bin/sh daemon:*:1:1:daemon:/usr/sbin:/bin/sh bin:*:2:2:bin:/bin:/bin/sh sys:*:3:3:sys:/dev:/bin/sh -@@ -15,4 +15,5 @@ +@@ -15,4 +15,6 @@ list:*:38:38:Mailing List Manager:/var/list:/bin/sh irc:*:39:39:ircd:/var/run/ircd:/bin/sh gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh +ntpd:*:47:65534:OpenNTPd daemon:/var/shared/empty:/dev/null ++mysql:*:64001:64001:MySQL daemon:/var/mysql:/dev/null nobody:*:65534:65534:nobody:/nonexistent:/bin/sh diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb index 4ebb5749dd..72caba0223 100644 --- a/packages/base-passwd/base-passwd_3.5.9.bb +++ b/packages/base-passwd/base-passwd_3.5.9.bb @@ -6,7 +6,8 @@ LICENSE = "GPL" SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ file://configure.patch;patch=1 \ file://nobash.patch;patch=1 \ - file://root-home.patch;patch=1" + file://root-home.patch;patch=1 \ + file://mysql.patch;patch=1" S = "${WORKDIR}/base-passwd" diff --git a/packages/bluez-utils/bluez-utils-common_2.17.inc b/packages/bluez-utils/bluez-utils-common_2.17.inc index 69f9514695..348636b926 100644 --- a/packages/bluez-utils/bluez-utils-common_2.17.inc +++ b/packages/bluez-utils/bluez-utils-common_2.17.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "bluez-libs-${PV} pcmcia-cs" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch index c4bb288303..337c9aa73e 100644 --- a/packages/bluez-utils/files/base.patch +++ b/packages/bluez-utils/files/base.patch @@ -5,7 +5,13 @@ --- bluez-utils-2.17/pcmcia/bluetooth~base.patch +++ bluez-utils-2.17/pcmcia/bluetooth -@@ -18,6 +18,10 @@ +@@ -15,9 +15,16 @@ + + if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi + ++# Give the port some time to complete initialization ++sleep 5 ++ # Get device attributes get_info $DEVICE @@ -16,7 +22,7 @@ # # Serial devices # -@@ -25,7 +29,7 @@ +@@ -25,7 +32,7 @@ IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'` setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ diff --git a/packages/cdump/cdump-native.bb b/packages/cdump/cdump-native.bb index e2d8263228..3b14884a33 100644 --- a/packages/cdump/cdump-native.bb +++ b/packages/cdump/cdump-native.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Cdump tool from abiword - needed for building abiword" inherit native -S = ${WORKDIR}/abiword-2.0.12/ +S = "${WORKDIR}/abiword-2.0.12/" SRC_URI = "file://abiword-2.0.12/cdump.c" do_compile() { diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/compositeext/compositeext_cvs.bb index 08c8350254..4b01bcfef0 100644 --- a/packages/compositeext/compositeext_cvs.bb +++ b/packages/compositeext/compositeext_cvs.bb @@ -4,7 +4,7 @@ SECTION = "libs" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "xextensions fixesext" DESCRIPTION = "X Composite extension headers and specification" -DEFAULT_PREFERENCE = 1 +DEFAULT_PREFERENCE = "1" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=CompositeExt" S = "${WORKDIR}/CompositeExt" diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb index 4a0a457c35..b1e6b8a257 100644 --- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb +++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -DEPENDS = "cyrus-sasl" +DEPENDS = "cyrus-sasl db3" PR = "r0" LICENSE = "BSD" diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb index cfba85cf6f..65ea98ca75 100644 --- a/packages/dbh/dbh_1.0-18.bb +++ b/packages/dbh/dbh_1.0-18.bb @@ -9,7 +9,7 @@ LICENSE="QPL" SRC_URI="${SOURCEFORGE_MIRROR}/dbh/${PN}_${PV}.tar.bz2 \ file://${FILESDIR}/configure.patch;patch=1" -S=${WORKDIR}/${PN}_${PV} +S="${WORKDIR}/${PN}_${PV}" inherit autotools pkgconfig diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb index fffc93b636..b2fc9c44ac 100644 --- a/packages/dbus/dbus_0.23.1-osso5.bb +++ b/packages/dbus/dbus_0.23.1-osso5.bb @@ -21,7 +21,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV inherit autotools pkgconfig update-rc.d gettext -S = ${WORKDIR}/dbus-0.23.1 +S = "${WORKDIR}/dbus-0.23.1" INITSCRIPT_NAME = "dbus-1" INITSCRIPT_PARAMS = "defaults" diff --git a/packages/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb index 4880e55140..d4cec0efd7 100644 --- a/packages/detect-stylus/detect-stylus_0.10.bb +++ b/packages/detect-stylus/detect-stylus_0.10.bb @@ -12,4 +12,4 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb index dc967d8ab7..c0ece8754e 100644 --- a/packages/detect-stylus/detect-stylus_0.13.bb +++ b/packages/detect-stylus/detect-stylus_0.13.bb @@ -15,4 +15,4 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ file://extra-device-check.patch;patch=1 \ file://correct-theme-name.patch;patch=1" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/dillo/dillo2_0.6.6.bb b/packages/dillo/dillo2_0.6.6.bb index c4fff54e23..3416b01505 100644 --- a/packages/dillo/dillo2_0.6.6.bb +++ b/packages/dillo/dillo2_0.6.6.bb @@ -13,7 +13,7 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \ MAINTAINER = "Chris Lord <cwiiis@handhelds.org>" PRIORITY = "optional" -S = ${WORKDIR}/dillo-${PV}/ +S = "${WORKDIR}/dillo-${PV}/" inherit autotools pkgconfig diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb index 73614911c5..4df6eeb5c5 100644 --- a/packages/fakeroot/fakeroot-native_1.2.13.bb +++ b/packages/fakeroot/fakeroot-native_1.2.13.bb @@ -4,7 +4,7 @@ include fakeroot_${PV}.bb inherit native SRC_URI += "file://fix-prefix.patch;patch=1" -S = ${WORKDIR}/fakeroot-${PV} +S = "${WORKDIR}/fakeroot-${PV}" EXTRA_OECONF = "--program-prefix=" diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb index e1fd5ebfee..f141330276 100644 --- a/packages/fakeroot/fakeroot_1.2.13.bb +++ b/packages/fakeroot/fakeroot_1.2.13.bb @@ -5,4 +5,4 @@ LICENSE = "GPL" SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz" -inherit autotools +inherit autotools diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index 233be09722..add7fcbe7b 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -60,7 +60,7 @@ FILES_libavformat = "${libdir}/libavformat*.so.*" FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a" # We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff.. -PATH_prepend=${CROSS_DIR}/${TARGET_SYS}/bin: +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" # --enable-shared-pp \ diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb index 40ee8d937f..88f11bc8cd 100644 --- a/packages/ffmpeg/ffmpeg_cvs.bb +++ b/packages/ffmpeg/ffmpeg_cvs.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEPENDS = "zlib libvorbis faac liba52 lame" LICENSE = "GPL" PR = "r1" -S = ${WORKDIR}/ffmpeg +S = "${WORKDIR}/ffmpeg" DEFAULT_PREFERENCE = "-1" inherit autotools @@ -60,7 +60,7 @@ FILES_libavformat = "${libdir}/libavformat*.so.*" FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a" # We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff.. -PATH_prepend=${CROSS_DIR}/${TARGET_SYS}/bin: +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" do_configure_prepend() { diff --git a/packages/frotz/frotz_2.42.bb b/packages/frotz/frotz_2.42.bb index 5a16f68ce1..8daa6c514e 100644 --- a/packages/frotz/frotz_2.42.bb +++ b/packages/frotz/frotz_2.42.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Frotz is an interpreter for Infocom games and other Z-machine games." HOMEPAGE = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/" SECTION = "console/games" diff --git a/packages/frotz/frotz_2.43.bb b/packages/frotz/frotz_2.43.bb index defe0d4cf6..9cace09992 100644 --- a/packages/frotz/frotz_2.43.bb +++ b/packages/frotz/frotz_2.43.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Frotz is an interpreter for Infocom games and other Z-machine games." HOMEPAGE = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/" SECTION = "console/games" diff --git a/packages/frozen-bubble/frozen-bubble_1.0.0.bb b/packages/frozen-bubble/frozen-bubble_1.0.0.bb index b15486eade..503c4c7a7d 100644 --- a/packages/frozen-bubble/frozen-bubble_1.0.0.bb +++ b/packages/frozen-bubble/frozen-bubble_1.0.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "games" DEPENDS = "libsdl-mixer libsdl-image sdl-perl" diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb index 0cfeaeca83..625cbe28fb 100644 --- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb @@ -6,7 +6,7 @@ MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" SECTION = "net" LICENSE = "MIT" -DEPENDS = libusb +DEPENDS = "libusb" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_1 \ cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \ diff --git a/packages/gail/gail_1.6.6.bb b/packages/gail/gail_1.6.6.bb index 24b8d057d6..fe64b96da4 100644 --- a/packages/gail/gail_1.6.6.bb +++ b/packages/gail/gail_1.6.6.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/libs" PR = "r1" DESCRIPTION = "GNOME Accessibility Implementation Library" diff --git a/packages/gal/gal-2.0_1.99.11.bb b/packages/gal/gal-2.0_1.99.11.bb index 50ba8c3e61..1c5aad8027 100644 --- a/packages/gal/gal-2.0_1.99.11.bb +++ b/packages/gal/gal-2.0_1.99.11.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DEPENDS = "intltool libgnomeprint gtk+ libglade libgnomeui libgnomecanvas libxml2 libgnomeprintui" diff --git a/packages/gal/gal-2.1_2.1.10.bb b/packages/gal/gal-2.1_2.1.10.bb index ee76f21f0a..b4e958b86a 100644 --- a/packages/gal/gal-2.1_2.1.10.bb +++ b/packages/gal/gal-2.1_2.1.10.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DEPENDS = "intltool libgnomeprint gtk+ libglade libgnomeui libgnomecanvas libxml2 libgnomeprintui" diff --git a/packages/galculator/galculator_1.2.3.bb b/packages/galculator/galculator_1.2.3.bb index 3fefbc7f2c..a920b6b204 100644 --- a/packages/galculator/galculator_1.2.3.bb +++ b/packages/galculator/galculator_1.2.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r7" inherit autotools pkgconfig gconf diff --git a/packages/gcalctool/gcalctool_5.5.21.bb b/packages/gcalctool/gcalctool_5.5.21.bb index ec6c86f5a3..31f06e9bfd 100644 --- a/packages/gcalctool/gcalctool_5.5.21.bb +++ b/packages/gcalctool/gcalctool_5.5.21.bb @@ -2,7 +2,7 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" inherit gnome diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index 4d1e05457b..d01528c5ec 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -8,7 +8,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # Files for these are defined in the main gcc.oe PACKAGES = "libgcc libstdc++ libg2c" -INHIBIT_PACKAGE_STRIP = 1 +INHIBIT_PACKAGE_STRIP = "1" EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index 997c5044a7..b08112874a 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -9,7 +9,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # Files for these are defined in the main gcc.oe PACKAGES = "libgcc libstdc++ libg2c" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" -INHIBIT_PACKAGE_STRIP = 1 +INHIBIT_PACKAGE_STRIP = "1" EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" diff --git a/packages/gdb/gdb-cross_6.1.bb b/packages/gdb/gdb-cross_6.1.bb index c27960c7fd..94d9d12c57 100644 --- a/packages/gdb/gdb-cross_6.1.bb +++ b/packages/gdb/gdb-cross_6.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "gdb - GNU debugger" SECTION = "devel" PRIORITY = "optional" diff --git a/packages/gdb/gdb-cross_6.2.1.bb b/packages/gdb/gdb-cross_6.2.1.bb index 910f3ea88b..a6823b6373 100644 --- a/packages/gdb/gdb-cross_6.2.1.bb +++ b/packages/gdb/gdb-cross_6.2.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "gdb - GNU debugger" SECTION = "base" PRIORITY = "optional" diff --git a/packages/gdb/gdb-cross_6.2.bb b/packages/gdb/gdb-cross_6.2.bb index c27960c7fd..94d9d12c57 100644 --- a/packages/gdb/gdb-cross_6.2.bb +++ b/packages/gdb/gdb-cross_6.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "gdb - GNU debugger" SECTION = "devel" PRIORITY = "optional" diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 910f3ea88b..a6823b6373 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "gdb - GNU debugger" SECTION = "base" PRIORITY = "optional" diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb index 4cace02ef0..ec72ec0ecc 100644 --- a/packages/gdb/gdb_6.1.bb +++ b/packages/gdb/gdb_6.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "gdb - GNU debugger" SECTION = "devel" PRIORITY = "optional" diff --git a/packages/genext2fs/genext2fs.inc b/packages/genext2fs/genext2fs.inc index c8e71f70bc..c2984bccdd 100644 --- a/packages/genext2fs/genext2fs.inc +++ b/packages/genext2fs/genext2fs.inc @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "A tool to generate an ext2 filesystem \ as a normal (non-root) user." SECTION = "console/utils" diff --git a/packages/gimp/gimp_2.2.7.bb b/packages/gimp/gimp_2.2.7.bb index 0107916fdc..5380106a64 100644 --- a/packages/gimp/gimp_2.2.7.bb +++ b/packages/gimp/gimp_2.2.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org> +MAINTAINER = "Koen Kooi <koen@handhelds.org>" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2" diff --git a/packages/glib-2.0/glib-2.0_2.2.3.bb b/packages/glib-2.0/glib-2.0_2.2.3.bb index 65cba086e9..953e3d98f1 100644 --- a/packages/glib-2.0/glib-2.0_2.2.3.bb +++ b/packages/glib-2.0/glib-2.0_2.2.3.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GLib is a general-purpose utility library, \ which provides many useful data types, macros, \ type conversions, string utilities, file utilities, a main \ diff --git a/packages/glib-2.0/glib-2.0_2.4.5.bb b/packages/glib-2.0/glib-2.0_2.4.5.bb index 11a6c2a2d1..86ca5bd687 100644 --- a/packages/glib-2.0/glib-2.0_2.4.5.bb +++ b/packages/glib-2.0/glib-2.0_2.4.5.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GLib is a general-purpose utility library, \ which provides many useful data types, macros, \ type conversions, string utilities, file utilities, a main \ diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 5969b1a7c4..2b91317eae 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -247,7 +247,7 @@ include glibc-package.bbclass # Unslung distribution specific packages follow ... -PACKAGES_unslung = libc6-unslung +PACKAGES_unslung = "libc6-unslung" PACKAGE_ARCH_nslu2 = "nslu2" MAINTAINER_libc6-unslung = "NSLU2 Linux <www.nslu2-linux.org>" RDEPENDS_libc6-unslung = "nslu2-linksys-libs" diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb index cb55d5b5c4..cacd461a17 100644 --- a/packages/gnome/gconf_2.6.1.bb +++ b/packages/gnome/gconf_2.6.1.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/gnome" DESCRIPTION = "GNOME configuration database system" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb index efdda949cf..ed60b0c236 100644 --- a/packages/gnome/gnome-common_2.4.0.bb +++ b/packages/gnome/gnome-common_2.4.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" PR = "r0" DESCRIPTION = "Common macros for building GNOME applications" diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb index ab63577334..d385068c59 100644 --- a/packages/gnome/gnome-desktop_2.7.90.bb +++ b/packages/gnome/gnome-desktop_2.7.90.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" PR = "r0" DESCRIPTION = "GNOME library for reading .desktop files" diff --git a/packages/gnome/gnome-games_2.6.1.bb b/packages/gnome/gnome-games_2.6.1.bb index 3db93ccb2b..db74c5cfe7 100644 --- a/packages/gnome/gnome-games_2.6.1.bb +++ b/packages/gnome/gnome-games_2.6.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common" PR = "r2" diff --git a/packages/gnome/gnome-icon-theme_1.3.3.bb b/packages/gnome/gnome-icon-theme_1.3.3.bb index 37cca77fb9..23993c982d 100644 --- a/packages/gnome/gnome-icon-theme_1.3.3.bb +++ b/packages/gnome/gnome-icon-theme_1.3.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" diff --git a/packages/gnome/gnome-keyring_0.2.1.bb b/packages/gnome/gnome-keyring_0.2.1.bb index c40ba36cfb..707d3df311 100644 --- a/packages/gnome/gnome-keyring_0.2.1.bb +++ b/packages/gnome/gnome-keyring_0.2.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/0.2/${PN}-${PV}.tar.bz2" diff --git a/packages/gnome/gnome-mime-data_2.4.1.bb b/packages/gnome/gnome-mime-data_2.4.1.bb index dcf9eeb805..1a49ed8e72 100644 --- a/packages/gnome/gnome-mime-data_2.4.1.bb +++ b/packages/gnome/gnome-mime-data_2.4.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gnome DEPENDS += "intltool-native" diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index 2e2e80274d..beaef3c80c 100644 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" PR = "r1" PROVIDES = "gnome-vfs" diff --git a/packages/gnome/gnome-vfs-extras_0.99.13.bb b/packages/gnome/gnome-vfs-extras_0.99.13.bb index 4030454321..d348def996 100644 --- a/packages/gnome/gnome-vfs-extras_0.99.13.bb +++ b/packages/gnome/gnome-vfs-extras_0.99.13.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" PR = "r1" diff --git a/packages/gnome/gnome-vfs_2.6.0.bb b/packages/gnome/gnome-vfs_2.6.0.bb index fe59d43f22..14e8d11fc5 100644 --- a/packages/gnome/gnome-vfs_2.6.0.bb +++ b/packages/gnome/gnome-vfs_2.6.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r3" inherit gnome diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb index 3b15f282ba..a9df875a1a 100644 --- a/packages/gnome/gnome-vfs_2.6.2.bb +++ b/packages/gnome/gnome-vfs_2.6.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r4" inherit gnome diff --git a/packages/gnome/libbonobo_2.6.0.bb b/packages/gnome/libbonobo_2.6.0.bb index 4f6dbfd332..4af46fa444 100644 --- a/packages/gnome/libbonobo_2.6.0.bb +++ b/packages/gnome/libbonobo_2.6.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" DESCRIPTION = "Bonobo CORBA interfaces library" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \ diff --git a/packages/gnome/libbonobo_2.6.2.bb b/packages/gnome/libbonobo_2.6.2.bb index 5ae5da9fae..f2374b953f 100644 --- a/packages/gnome/libbonobo_2.6.2.bb +++ b/packages/gnome/libbonobo_2.6.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r1" SECTION = "x11/gnome/libs" DESCRIPTION = "Bonobo CORBA interfaces library" diff --git a/packages/gnome/libbonoboui_2.6.1.bb b/packages/gnome/libbonoboui_2.6.1.bb index d278787088..34f10c60d6 100644 --- a/packages/gnome/libbonoboui_2.6.1.bb +++ b/packages/gnome/libbonoboui_2.6.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" diff --git a/packages/gnome/libgnome_2.6.1.1.bb b/packages/gnome/libgnome_2.6.1.1.bb index 41b072207e..06b85b7775 100644 --- a/packages/gnome/libgnome_2.6.1.1.bb +++ b/packages/gnome/libgnome_2.6.1.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" diff --git a/packages/gnome/libgnomecanvas_2.6.1.1.bb b/packages/gnome/libgnomecanvas_2.6.1.1.bb index ce9cffe4b2..36ee1aa67f 100644 --- a/packages/gnome/libgnomecanvas_2.6.1.1.bb +++ b/packages/gnome/libgnomecanvas_2.6.1.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" DESCRIPTION = "A powerful object-oriented display" diff --git a/packages/gnome/libgnomeprint_2.6.2.bb b/packages/gnome/libgnomeprint_2.6.2.bb index bbec31e74e..ae9d6cc70b 100644 --- a/packages/gnome/libgnomeprint_2.6.2.bb +++ b/packages/gnome/libgnomeprint_2.6.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" diff --git a/packages/gnome/libgnomeprint_2.8.2.bb b/packages/gnome/libgnomeprint_2.8.2.bb index bbec31e74e..ae9d6cc70b 100644 --- a/packages/gnome/libgnomeprint_2.8.2.bb +++ b/packages/gnome/libgnomeprint_2.8.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" diff --git a/packages/gnome/libgnomeprintui_2.6.2.bb b/packages/gnome/libgnomeprintui_2.6.2.bb index c5f94338b4..5a37a78514 100644 --- a/packages/gnome/libgnomeprintui_2.6.2.bb +++ b/packages/gnome/libgnomeprintui_2.6.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common" diff --git a/packages/gnome/libgnomeprintui_2.8.2.bb b/packages/gnome/libgnomeprintui_2.8.2.bb index c5f94338b4..5a37a78514 100644 --- a/packages/gnome/libgnomeprintui_2.8.2.bb +++ b/packages/gnome/libgnomeprintui_2.8.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common" diff --git a/packages/gnome/libgnomeui_2.6.1.1.bb b/packages/gnome/libgnomeui_2.6.1.1.bb index 7c565da685..844d91b1fd 100644 --- a/packages/gnome/libgnomeui_2.6.1.1.bb +++ b/packages/gnome/libgnomeui_2.6.1.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome/libs" PR = "r1" DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" diff --git a/packages/gnome/orbit2_2.10.2.bb b/packages/gnome/orbit2_2.10.2.bb index cd7eb1bcc3..83d6f0ec15 100644 --- a/packages/gnome/orbit2_2.10.2.bb +++ b/packages/gnome/orbit2_2.10.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r2" DESCRIPTION = "CORBA ORB" SECTION = "x11/gnome/libs" diff --git a/packages/gnumeric/gnumeric_1.3.1.bb b/packages/gnumeric/gnumeric_1.3.1.bb index fa40896e8b..164982aec3 100644 --- a/packages/gnumeric/gnumeric_1.3.1.bb +++ b/packages/gnumeric/gnumeric_1.3.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r3" S = "${WORKDIR}/gnumeric-${PV}" diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb index 1b55704704..10590efcac 100644 --- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb +++ b/packages/gnumeric/gnumeric_1.3.1.cvs.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" #CVSDATE="20040719" CVSTAG="GNUMERIC_1_3_1" diff --git a/packages/gnumeric/gnumeric_1.5.1.bb b/packages/gnumeric/gnumeric_1.5.1.bb index d1de728d66..42552ae45e 100644 --- a/packages/gnumeric/gnumeric_1.5.1.bb +++ b/packages/gnumeric/gnumeric_1.5.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" S = "${WORKDIR}/gnumeric-${PV}" diff --git a/packages/gpdf/gpdf_2.7.90.bb b/packages/gpdf/gpdf_2.7.90.bb index 1df123a157..975523530a 100644 --- a/packages/gpdf/gpdf_2.7.90.bb +++ b/packages/gpdf/gpdf_2.7.90.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r2" diff --git a/packages/gpdf/gpdf_2.8.0.bb b/packages/gpdf/gpdf_2.8.0.bb index be94c73645..60fc1d3007 100644 --- a/packages/gpdf/gpdf_2.8.0.bb +++ b/packages/gpdf/gpdf_2.8.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" diff --git a/packages/gpdf/gpdf_2.8.2.bb b/packages/gpdf/gpdf_2.8.2.bb index 3e937b9139..23e294bda7 100644 --- a/packages/gpdf/gpdf_2.8.2.bb +++ b/packages/gpdf/gpdf_2.8.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" diff --git a/packages/gpe-gallery/gpe-gallery_0.94.bb b/packages/gpe-gallery/gpe-gallery_0.94.bb index 3c02f0f2f4..4409171f48 100644 --- a/packages/gpe-gallery/gpe-gallery_0.94.bb +++ b/packages/gpe-gallery/gpe-gallery_0.94.bb @@ -12,5 +12,5 @@ FILES_${PN} += "${datadir}/gpe/pixmaps" FILES_${PN} += "${datadir}/application-registry" DESCRIPTION = "GPE image viewer application" -export CVSBUILD = no +export CVSBUILD = "no" diff --git a/packages/gpe-gallery/gpe-gallery_0.95.bb b/packages/gpe-gallery/gpe-gallery_0.95.bb index 3c02f0f2f4..4409171f48 100644 --- a/packages/gpe-gallery/gpe-gallery_0.95.bb +++ b/packages/gpe-gallery/gpe-gallery_0.95.bb @@ -12,5 +12,5 @@ FILES_${PN} += "${datadir}/gpe/pixmaps" FILES_${PN} += "${datadir}/application-registry" DESCRIPTION = "GPE image viewer application" -export CVSBUILD = no +export CVSBUILD = "no" diff --git a/packages/gpe-gallery/gpe-gallery_0.96.bb b/packages/gpe-gallery/gpe-gallery_0.96.bb index 51d6e56983..4a6a18a430 100644 --- a/packages/gpe-gallery/gpe-gallery_0.96.bb +++ b/packages/gpe-gallery/gpe-gallery_0.96.bb @@ -11,5 +11,5 @@ FILES_${PN} += "${datadir}/gpe/pixmaps" FILES_${PN} += "${datadir}/application-registry" DESCRIPTION = "GPE image viewer application" -export CVSBUILD = no +export CVSBUILD = "no" diff --git a/packages/gpe-mininet/gpe-mininet_0.4.bb b/packages/gpe-mininet/gpe-mininet_0.4.bb index 2ed9f76631..79b9e7b26d 100644 --- a/packages/gpe-mininet/gpe-mininet_0.4.bb +++ b/packages/gpe-mininet/gpe-mininet_0.4.bb @@ -14,4 +14,4 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN} += " ${datadir}/gpe/pixmaps" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/gpe-mininet/gpe-mininet_0.5.bb b/packages/gpe-mininet/gpe-mininet_0.5.bb index 8068fc2621..3507d4e16f 100644 --- a/packages/gpe-mininet/gpe-mininet_0.5.bb +++ b/packages/gpe-mininet/gpe-mininet_0.5.bb @@ -12,4 +12,4 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN} += " ${datadir}/gpe/pixmaps" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/gpe-mixer/gpe-mixer_0.32.bb b/packages/gpe-mixer/gpe-mixer_0.32.bb index 324d7198ab..d064a3c55f 100644 --- a/packages/gpe-mixer/gpe-mixer_0.32.bb +++ b/packages/gpe-mixer/gpe-mixer_0.32.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gpe pkgconfig DESCRIPTION = "GPE audio mixer" diff --git a/packages/gpe-mixer/gpe-mixer_0.34.bb b/packages/gpe-mixer/gpe-mixer_0.34.bb index 8a93148b0a..d6cb6dc7d4 100644 --- a/packages/gpe-mixer/gpe-mixer_0.34.bb +++ b/packages/gpe-mixer/gpe-mixer_0.34.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gpe pkgconfig DESCRIPTION = "GPE audio mixer" diff --git a/packages/gpe-mixer/gpe-mixer_0.38.bb b/packages/gpe-mixer/gpe-mixer_0.38.bb index 8a93148b0a..d6cb6dc7d4 100644 --- a/packages/gpe-mixer/gpe-mixer_0.38.bb +++ b/packages/gpe-mixer/gpe-mixer_0.38.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gpe pkgconfig DESCRIPTION = "GPE audio mixer" diff --git a/packages/gpe-mixer/gpe-mixer_0.40.bb b/packages/gpe-mixer/gpe-mixer_0.40.bb index f90883e77e..3d3ef98917 100644 --- a/packages/gpe-mixer/gpe-mixer_0.40.bb +++ b/packages/gpe-mixer/gpe-mixer_0.40.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r0" inherit gpe pkgconfig diff --git a/packages/gpe-mixer/gpe-mixer_0.41.bb b/packages/gpe-mixer/gpe-mixer_0.41.bb index f90883e77e..3d3ef98917 100644 --- a/packages/gpe-mixer/gpe-mixer_0.41.bb +++ b/packages/gpe-mixer/gpe-mixer_0.41.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r0" inherit gpe pkgconfig diff --git a/packages/gpe-shield/gpe-shield_0.2.bb b/packages/gpe-shield/gpe-shield_0.2.bb index c255c25a21..f5766871bc 100644 --- a/packages/gpe-shield/gpe-shield_0.2.bb +++ b/packages/gpe-shield/gpe-shield_0.2.bb @@ -7,7 +7,7 @@ SECTION = "gpe" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" DESCRIPTION = "GPE network security tool" -export CVSBUILD = no +export CVSBUILD = "no" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ file://${FILESDIR}/makefile.patch;patch=1;pnum=0" diff --git a/packages/gpe-shield/gpe-shield_0.3.bb b/packages/gpe-shield/gpe-shield_0.3.bb index 5be2c5eb1a..7fe229e35d 100644 --- a/packages/gpe-shield/gpe-shield_0.3.bb +++ b/packages/gpe-shield/gpe-shield_0.3.bb @@ -7,7 +7,7 @@ SECTION = "gpe" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" DESCRIPTION = "GPE network security tool" -export CVSBUILD = no +export CVSBUILD = "no" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" diff --git a/packages/gpe-shield/gpe-shield_0.4.bb b/packages/gpe-shield/gpe-shield_0.4.bb index 0280a310b3..8a9d5b693c 100644 --- a/packages/gpe-shield/gpe-shield_0.4.bb +++ b/packages/gpe-shield/gpe-shield_0.4.bb @@ -8,7 +8,7 @@ SECTION = "gpe" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" DESCRIPTION = "GPE network security tool" -export CVSBUILD = no +export CVSBUILD = "no" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" diff --git a/packages/gpe-shield/gpe-shield_0.6.bb b/packages/gpe-shield/gpe-shield_0.6.bb index 6b1e1829d4..eff82cb38d 100644 --- a/packages/gpe-shield/gpe-shield_0.6.bb +++ b/packages/gpe-shield/gpe-shield_0.6.bb @@ -8,7 +8,7 @@ SECTION = "gpe" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" DESCRIPTION = "GPE network security tool" -export CVSBUILD = no +export CVSBUILD = "no" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ file://backend-iptables.patch;patch=1;pnum=0 \ diff --git a/packages/gpe-shield/gpe-shield_0.8.bb b/packages/gpe-shield/gpe-shield_0.8.bb index d76be2d7aa..ce6843a468 100644 --- a/packages/gpe-shield/gpe-shield_0.8.bb +++ b/packages/gpe-shield/gpe-shield_0.8.bb @@ -3,7 +3,7 @@ inherit gpe pkgconfig LICENSE = "GPL" DEPENDS = "libgpewidget iptables virtual/kernel" RDEPENDS = "iptables" -RRECOMMENDS = kernel-module-ipt-state" +RRECOMMENDS = "kernel-module-ipt-state" SECTION = "gpe" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb index 8be4e64036..930599fa8f 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r4" inherit gpe pkgconfig @@ -9,7 +9,7 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" SECTION = "gpe" PRIORITY = "optional" DESCRIPTION = "A GPE notebook to sketch your notes" -export CVSBUILD = no +export CVSBUILD = "no" CFLAGS +="-D_GNU_SOURCE" diff --git a/packages/gpe-tetris/gpe-tetris_0.6-2.bb b/packages/gpe-tetris/gpe-tetris_0.6-2.bb index b60b179e43..70b1e7999a 100644 --- a/packages/gpe-tetris/gpe-tetris_0.6-2.bb +++ b/packages/gpe-tetris/gpe-tetris_0.6-2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gpe DESCRIPTION = "GTK+2 port of the well known game, Tetris." diff --git a/packages/gpe-tetris/gpe-tetris_0.6-4.bb b/packages/gpe-tetris/gpe-tetris_0.6-4.bb index 28cffcbcd9..4a13d2443f 100644 --- a/packages/gpe-tetris/gpe-tetris_0.6-4.bb +++ b/packages/gpe-tetris/gpe-tetris_0.6-4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gpe DESCRIPTION = "GTK+2 port of the well known game, Tetris." diff --git a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb b/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb index 1c7468656f..fedad2189a 100644 --- a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb +++ b/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Simple GPE theme using the Smooth theming engine." MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" DEPENDS = "gtk-smooth-engine" RDEPENDS = "gtk-smooth-engine" -S = ${WORKDIR}/foxbox +S = "${WORKDIR}/foxbox" FILES_${PN} = "${datadir}/themes" diff --git a/packages/gpe-todo/gpe-todo-hildon_0.54.bb b/packages/gpe-todo/gpe-todo-hildon_0.54.bb index afa511fcb9..51f08a7577 100644 --- a/packages/gpe-todo/gpe-todo-hildon_0.54.bb +++ b/packages/gpe-todo/gpe-todo-hildon_0.54.bb @@ -13,6 +13,6 @@ EXTRA_OECONF = "--enable-hildon" SRC_URI="${GPE_MIRROR}/gpe-todo-${PV}.tar.bz2" -S = ${WORKDIR}/gpe-todo-${PV} +S = "${WORKDIR}/gpe-todo-${PV}" FILES_${PN} += "${datadir}/gpe-todo ${libdir}/dbus-1.0" diff --git a/packages/gpe-watch/gpe-watch_0.10.bb b/packages/gpe-watch/gpe-watch_0.10.bb index 772669ce19..e0d514701c 100644 --- a/packages/gpe-watch/gpe-watch_0.10.bb +++ b/packages/gpe-watch/gpe-watch_0.10.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit gpe pkgconfig DESCRIPTION = "GPE analog clock-watch" diff --git a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb b/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb index 38262f98cc..0e752f48b8 100644 --- a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb +++ b/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb @@ -8,7 +8,7 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" RDEPENDS = "gpe-su" DESCRIPTION = "GPE wireless LAN configuration tool" -export CVSBUILD = no +export CVSBUILD = "no" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ file://${FILESDIR}/gpe-wlancfg-makefile.patch;patch=1;pnum=0" diff --git a/packages/gpgme/gpgme_1.0.0.bb b/packages/gpgme/gpgme_1.0.0.bb index 6bf78cfce8..8292991a89 100644 --- a/packages/gpgme/gpgme_1.0.0.bb +++ b/packages/gpgme/gpgme_1.0.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" PR = "r1" diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb index 98dc239880..5ebed8f8bf 100644 --- a/packages/gphoto2/gphoto2_2.1.4.bb +++ b/packages/gphoto2/gphoto2_2.1.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DEPENDS = "libgphoto2 popt" DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb index 51dacccd0f..dc49ce74b0 100644 --- a/packages/gphoto2/gphoto2_2.1.5.bb +++ b/packages/gphoto2/gphoto2_2.1.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DEPENDS = "libgphoto2 popt" DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb new file mode 100644 index 0000000000..51dacccd0f --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.6.bb @@ -0,0 +1,8 @@ +LICENSE = GPL +SECTION = "console/utils" +DEPENDS = "libgphoto2 popt" +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/gpsd/gpsd_2.6.bb b/packages/gpsd/gpsd_2.6.bb index be796d6fe7..1bf8d87837 100644 --- a/packages/gpsd/gpsd_2.6.bb +++ b/packages/gpsd/gpsd_2.6.bb @@ -12,7 +12,7 @@ inherit autotools update-rc.d INITSCRIPT_NAME = "gpsd" INITSCRIPT_PARAMS = "defaults 35" -LDFLAGS = -lm +LDFLAGS = "-lm" do_configure() { oe_runconf diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb index c900599de9..0f18902190 100644 --- a/packages/grep/grep_2.5.1.bb +++ b/packages/grep/grep_2.5.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "grep GNU utility" MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" diff --git a/packages/grep/grep_2.5.bb b/packages/grep/grep_2.5.bb index e7809587ee..c71dbb09ea 100644 --- a/packages/grep/grep_2.5.bb +++ b/packages/grep/grep_2.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "grep GNU utility" MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" diff --git a/packages/gs/gs_8.01.bb b/packages/gs/gs_8.01.bb index 2495aa7732..180fd8b32a 100644 --- a/packages/gs/gs_8.01.bb +++ b/packages/gs/gs_8.01.bb @@ -1,12 +1,12 @@ DESCRIPTION = "An interpreter of the Postscript language" -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" SRC_URI = "ftp://ftp.gnu.org/gnu/ghostscript/gnughostscript-${PV}.tar.gz" DEPENDS = "jpeg zlib" PR = "r2" # | make: ./obj/echogs: Command not found -BROKEN = 1 +BROKEN = "1" S = "${WORKDIR}/gnughostscript-${PV}" diff --git a/packages/gstreamer/gpe-gst-plugins_0.8.4.bb b/packages/gstreamer/gpe-gst-plugins_0.8.4.bb index b984f09863..553344b6e6 100644 --- a/packages/gstreamer/gpe-gst-plugins_0.8.4.bb +++ b/packages/gstreamer/gpe-gst-plugins_0.8.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Plugins for GStreamer" SECTION = "x11/libs" PRIORITY = "optional" @@ -13,7 +13,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.ta file://try-esdsink.patch;patch=1 \ file://lame-autoconf.patch;patch=1" -S = ${WORKDIR}/gst-plugins-${PV}/ +S = "${WORKDIR}/gst-plugins-${PV}/" EXTRA_OECONF = "--disable-docs-build \ --disable-dependency-tracking \ diff --git a/packages/gstreamer/gst-plugins_0.8.4.bb b/packages/gstreamer/gst-plugins_0.8.4.bb index 7b34c687f9..9b63f21a2c 100644 --- a/packages/gstreamer/gst-plugins_0.8.4.bb +++ b/packages/gstreamer/gst-plugins_0.8.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Plugins for GStreamer" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/gstreamer/gst-plugins_0.8.6.bb b/packages/gstreamer/gst-plugins_0.8.6.bb index 7e737fc14b..2292b2642d 100644 --- a/packages/gstreamer/gst-plugins_0.8.6.bb +++ b/packages/gstreamer/gst-plugins_0.8.6.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Plugins for GStreamer" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb index 0de72d1129..517f28359f 100644 --- a/packages/gstreamer/gst-plugins_0.8.7.bb +++ b/packages/gstreamer/gst-plugins_0.8.7.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Plugins for GStreamer" SECTION = "x11/libs" PRIORITY = "optional" diff --git a/packages/gstreamer/gstreamer_0.8.5.bb b/packages/gstreamer/gstreamer_0.8.5.bb index 5f85f66fab..f55828d15b 100644 --- a/packages/gstreamer/gstreamer_0.8.5.bb +++ b/packages/gstreamer/gstreamer_0.8.5.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" PR = "r0" DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ diff --git a/packages/gstreamer/gstreamer_0.8.7.bb b/packages/gstreamer/gstreamer_0.8.7.bb index fdaaa03e30..b01c57ae5c 100644 --- a/packages/gstreamer/gstreamer_0.8.7.bb +++ b/packages/gstreamer/gstreamer_0.8.7.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" PR = "r0" DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ diff --git a/packages/gstreamer/gstreamer_0.8.9.bb b/packages/gstreamer/gstreamer_0.8.9.bb index bb2e7a0905..ec5049e38f 100644 --- a/packages/gstreamer/gstreamer_0.8.9.bb +++ b/packages/gstreamer/gstreamer_0.8.9.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" PR = "r3" DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb index 75b5c6e19b..2056567cc8 100644 --- a/packages/gtk+/gtk+-1.2_1.2.10.bb +++ b/packages/gtk+/gtk+-1.2_1.2.10.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+1.2 is a deprecated library provided for running programs not yet converted to GTK+2.0" HOMEPAGE = "http://www.gtk.org" SECTION = "libs" diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb index eb4e088b78..516a342540 100644 --- a/packages/gtk+/gtk+_2.2.4.bb +++ b/packages/gtk+/gtk+_2.2.4.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb index 01a3b2a14e..2b05db2eaa 100644 --- a/packages/gtk+/gtk+_2.4.13.bb +++ b/packages/gtk+/gtk+_2.4.13.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb index 690f5efec6..d663ca4e83 100644 --- a/packages/gtk+/gtk+_2.4.4.bb +++ b/packages/gtk+/gtk+_2.4.4.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.6.0.bb b/packages/gtk+/gtk+_2.6.0.bb index 1aa164e182..fb32bfd263 100644 --- a/packages/gtk+/gtk+_2.6.0.bb +++ b/packages/gtk+/gtk+_2.6.0.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.6.1.bb b/packages/gtk+/gtk+_2.6.1.bb index 1ed4eb13b8..5a5e4ccb67 100644 --- a/packages/gtk+/gtk+_2.6.1.bb +++ b/packages/gtk+/gtk+_2.6.1.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.6.2.bb b/packages/gtk+/gtk+_2.6.2.bb index 1a842d160f..a69660d0fe 100644 --- a/packages/gtk+/gtk+_2.6.2.bb +++ b/packages/gtk+/gtk+_2.6.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.6.3.bb b/packages/gtk+/gtk+_2.6.3.bb index 8b3fb1e8e0..b2fe65e8ca 100644 --- a/packages/gtk+/gtk+_2.6.3.bb +++ b/packages/gtk+/gtk+_2.6.3.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb index ef404fdc5d..146da9f3e0 100644 --- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb +++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk+/gtk+_2.6.7.bb b/packages/gtk+/gtk+_2.6.7.bb index 88375655e1..2e81792799 100644 --- a/packages/gtk+/gtk+_2.6.7.bb +++ b/packages/gtk+/gtk+_2.6.7.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." HOMEPAGE = "http://www.gtk.org" diff --git a/packages/gtk-engines/gtk-engines_2.2.0.bb b/packages/gtk-engines/gtk-engines_2.2.0.bb index 1e93abc936..97f26b288c 100644 --- a/packages/gtk-engines/gtk-engines_2.2.0.bb +++ b/packages/gtk-engines/gtk-engines_2.2.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/base" DESCRIPTION = "GTK theme engines" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gtk-engines/gtk-engines_2.6.1.bb b/packages/gtk-engines/gtk-engines_2.6.1.bb index d75701757e..1d3b6bc1ff 100644 --- a/packages/gtk-engines/gtk-engines_2.6.1.bb +++ b/packages/gtk-engines/gtk-engines_2.6.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/base" DESCRIPTION = "GTK theme engines" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gtk-engines/gtk-engines_2.6.3.bb b/packages/gtk-engines/gtk-engines_2.6.3.bb index d75701757e..1d3b6bc1ff 100644 --- a/packages/gtk-engines/gtk-engines_2.6.3.bb +++ b/packages/gtk-engines/gtk-engines_2.6.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/base" DESCRIPTION = "GTK theme engines" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/gtk-webcore/osb-browser_0.5.0.bb b/packages/gtk-webcore/osb-browser_0.5.0.bb index 2bc396a5d2..93821ccb7f 100644 --- a/packages/gtk-webcore/osb-browser_0.5.0.bb +++ b/packages/gtk-webcore/osb-browser_0.5.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Gtk+ WebCore - reference browser" HOMEPAGE = "http://gtk-webcore.sourceforge.net/" PRIORITY = "optional" diff --git a/packages/gtk-webcore/osb-browser_20050430.bb b/packages/gtk-webcore/osb-browser_20050430.bb index ae9115ec18..75fd79636c 100644 --- a/packages/gtk-webcore/osb-browser_20050430.bb +++ b/packages/gtk-webcore/osb-browser_20050430.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Gtk+ WebCore - reference browser" HOMEPAGE = "http://gtk-webcore.sourceforge.net/" -LICENSE = GPL +LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" diff --git a/packages/gtk-webcore/osb-jscore_0.5.0.bb b/packages/gtk-webcore/osb-jscore_0.5.0.bb index 2d4f8a92b2..5e38d59f77 100644 --- a/packages/gtk-webcore/osb-jscore_0.5.0.bb +++ b/packages/gtk-webcore/osb-jscore_0.5.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Gtk+ WebCore - JavaScriptCore" HOMEPAGE = "http://gtk-webcore.sourceforge.net/" PRIORITY = "optional" diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb index 9ac9daa836..963f603ca3 100644 --- a/packages/gtk-webcore/osb-jscore_20050430.bb +++ b/packages/gtk-webcore/osb-jscore_20050430.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Gtk+ WebCore - JavaScriptCore" HOMEPAGE = "http://gtk-webcore.sourceforge.net/" -LICENSE = GPL +LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" diff --git a/packages/gtk-webcore/osb-nrcore_0.5.0.bb b/packages/gtk-webcore/osb-nrcore_0.5.0.bb index 08fc0145ee..ec9e1067c5 100644 --- a/packages/gtk-webcore/osb-nrcore_0.5.0.bb +++ b/packages/gtk-webcore/osb-nrcore_0.5.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Gtk+ WebCore - rendering engine" HOMEPAGE = "http://gtk-webcore.sourceforge.net/" PRIORITY = "optional" diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb index 74698ff512..8c83976eb4 100644 --- a/packages/gtk-webcore/osb-nrcore_20050430.bb +++ b/packages/gtk-webcore/osb-nrcore_20050430.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Gtk+ WebCore - rendering engine" HOMEPAGE = "http://gtk-webcore.sourceforge.net/" -LICENSE = GPL +LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb index 4922c57143..165b2ff5f4 100644 --- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DESCRIPTION = "HTML rendering/editing library" DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" diff --git a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb index 5937b25acb..2b57a0b2c4 100644 --- a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb +++ b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DESCRIPTION = "HTML rendering/editing library" DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index 8ed1fa938c..c3687b70cc 100644 --- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DESCRIPTION = "HTML rendering/editing library" DEPENDS = "gtk+ gail libgnomeprint orbit2-native" diff --git a/packages/gtkmm/gtkmm_2.4.8.bb b/packages/gtkmm/gtkmm_2.4.8.bb index 14927f4a2e..9189c91e43 100644 --- a/packages/gtkmm/gtkmm_2.4.8.bb +++ b/packages/gtkmm/gtkmm_2.4.8.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "C++ bindings for the GTK+ toolkit." HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" diff --git a/packages/gweled/gweled_0.5.bb b/packages/gweled/gweled_0.5.bb index 1ecc333b8d..0843bb30ee 100644 --- a/packages/gweled/gweled_0.5.bb +++ b/packages/gweled/gweled_0.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" inherit autotools SECTION = "x11/games" DESCRIPTION = "Clone of Bejeweled for Gnome, modified for GPE." diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb index 1743d4cdb8..ef68a314de 100644 --- a/packages/gxine/gxine_0.4.1.bb +++ b/packages/gxine/gxine_0.4.1.bb @@ -39,7 +39,7 @@ EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \ --disable-xinetest \ --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}" -LDFLAGS += -lxine +LDFLAGS += "-lxine" inherit autotools pkgconfig diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb index ca04e626f3..2ad90c789c 100644 --- a/packages/gxine/gxine_0.4.1enhanced.bb +++ b/packages/gxine/gxine_0.4.1enhanced.bb @@ -27,7 +27,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \ libxine-plugin-dmx-image \ libxine-plugin-dmx-avi" -S = ${WORKDIR}/${PN}-0.4.1/ +S = "${WORKDIR}/${PN}-0.4.1/" SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \ file://rhythmbox-volume-max.png \ @@ -41,7 +41,7 @@ EXTRA_OECONF = " --includedir=${STAGING_INCDIR} \ --disable-xinetest \ --with-xine-prefix=${STAGING_DIR}/${HOST_SYS}" -LDFLAGS += -lxine +LDFLAGS += "-lxine" inherit autotools pkgconfig diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb index be107edcc0..e99c76dcb4 100644 --- a/packages/gzip/gzip_1.3.5.bb +++ b/packages/gzip/gzip_1.3.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" PRIORITY = "required" MAINTAINER = "Greg Gilbert <greg@treke.net>" diff --git a/packages/hotplug-qcop/hotplug-qcop_cvs.bb b/packages/hotplug-qcop/hotplug-qcop_cvs.bb index b62551a8ec..711b9a6f8d 100644 --- a/packages/hotplug-qcop/hotplug-qcop_cvs.bb +++ b/packages/hotplug-qcop/hotplug-qcop_cvs.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/hotplug-qcop" inherit opie -sbindir=/sbin +sbindir="/sbin" do_install() { install -d ${D}${sbindir} diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb index ba8d548b6e..475e273f3d 100644 --- a/packages/initscripts/initscripts-openslug_1.0.bb +++ b/packages/initscripts/initscripts-openslug_1.0.bb @@ -23,7 +23,7 @@ SRC_URI += "file://rootopts.patch;patch=1" SRC_URI += "file://devices.patch;patch=1" # Without this it is not possible to patch checkroot.sh -S = ${WORKDIR} +S = "${WORKDIR}" do_install_append() { install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb index 3434bfc3a7..ef075e8c8a 100644 --- a/packages/iperf/iperf_1.7.0.bb +++ b/packages/iperf/iperf_1.7.0.bb @@ -9,8 +9,8 @@ SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ inherit autotools -S=${WORKDIR}/iperf-${PV}/cfg -PATCHES_DIR=${WORKDIR}/iperf-${PV} +S="${WORKDIR}/iperf-${PV}/cfg" +PATCHES_DIR="${WORKDIR}/iperf-${PV}" do_configure() { oe_runconf diff --git a/packages/ipkg/ipkg-native_0.99.146.bb b/packages/ipkg/ipkg-native_0.99.146.bb index 8886d44679..2652f931ea 100644 --- a/packages/ipkg/ipkg-native_0.99.146.bb +++ b/packages/ipkg/ipkg-native_0.99.146.bb @@ -5,7 +5,7 @@ include ipkg_${PV}.bb # things into the wrong location inside of offline_root. Backup # the target libdir and use that. target_libdir := "${libdir}" -DEFAULT_PREFERENCE=-1 +DEFAULT_PREFERENCE="-1" inherit native diff --git a/packages/ipkg/ipkg_0.99.146.bb b/packages/ipkg/ipkg_0.99.146.bb index 6d5d4e74ef..4841ded663 100644 --- a/packages/ipkg/ipkg_0.99.146.bb +++ b/packages/ipkg/ipkg_0.99.146.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" PROVIDES = "virtual/ipkg libipkg" PR = "r2" -DEFAULT_PREFERENCE=-1 +DEFAULT_PREFERENCE="-1" PACKAGES =+ "libipkg-dev libipkg" FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" diff --git a/packages/kdepimpi/files/opie-fontselector-copy.patch b/packages/kdepimpi/files/opie-fontselector-copy.patch deleted file mode 100644 index c38c25a359..0000000000 --- a/packages/kdepimpi/files/opie-fontselector-copy.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch taken from OPIE project - -Index: ofontselector.cpp -=================================================================== -RCS file: /cvs/opie/libopie2/opieui/ofontselector.cpp,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- kdepim/microkde/ofontselector.cpp.orig 2005-03-08 14:13:14 +0100 -+++ kdepim/microkde/ofontselector.cpp 2005-03-08 14:14:48 +0100 -@@ -137,7 +137,7 @@ - this, SLOT( fontSizeClicked( int ) ) ); - gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); - -- d-> m_pointbug = ( qt_version ( ) <= 233 ); -+ d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2 - - if ( withpreview ) { - d-> m_preview = new QMultiLineEdit ( this, "Preview" ); diff --git a/packages/kdepimpi/kdepimpi_2.1.9.bb b/packages/kdepimpi/kdepimpi_2.1.13.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.9.bb +++ b/packages/kdepimpi/kdepimpi_2.1.13.bb diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc index 7f4ebcc5a0..2b77eed0de 100644 --- a/packages/kdepimpi/pwmpi.inc +++ b/packages/kdepimpi/pwmpi.inc @@ -12,6 +12,9 @@ INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \ LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \ " +do_configure_prepend() { +} + do_stage() { } diff --git a/packages/kdepimpi/pwmpi_2.1.9.bb b/packages/kdepimpi/pwmpi_2.1.13.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.9.bb +++ b/packages/kdepimpi/pwmpi_2.1.13.bb diff --git a/packages/keylaunch/keylaunch_2.0.7.bb b/packages/keylaunch/keylaunch_2.0.7.bb index eabc1a164a..5f05f140c3 100644 --- a/packages/keylaunch/keylaunch_2.0.7.bb +++ b/packages/keylaunch/keylaunch_2.0.7.bb @@ -17,4 +17,4 @@ do_install_prepend () { install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc } -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb index 016a0358c5..10fcc9e998 100644 --- a/packages/keyring/keyring_0.6.8.bb +++ b/packages/keyring/keyring_0.6.8.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/Keyring" inherit palmtop -QPEDIR = ${OPIEDIR} +QPEDIR = "${OPIEDIR}" do_install() { install -d ${D}${palmtopdir}/bin \ diff --git a/packages/konqueror/konqueror-embedded_20050322.bb b/packages/konqueror/konqueror-embedded_20050322.bb index ca11edbfe4..36a59b0834 100644 --- a/packages/konqueror/konqueror-embedded_20050322.bb +++ b/packages/konqueror/konqueror-embedded_20050322.bb @@ -32,8 +32,8 @@ EXTRA_OECONF += '--with-ssl-version=0.9.7e --with-ssl-dir=${STAGING_LIBDIR}/..' EXTRA_OECONF += '--with-qt-includes=${STAGING_INCDIR}/qt3' EXTRA_OECONF += '--with-qt-libraries=${STAGING_LIBDIR}' -MOC = ${STAGING_BINDIR}/moc3 -UIC = ${STAGING_BINDIR}/uic3 +MOC = "${STAGING_BINDIR}/moc3" +UIC = "${STAGING_BINDIR}/uic3" do_compile_prepend() { perl admin/am_edit diff --git a/packages/lftp/lftp_3.0.1.bb b/packages/lftp/lftp_3.0.1.bb index d15b119046..ae62962343 100644 --- a/packages/lftp/lftp_3.0.1.bb +++ b/packages/lftp/lftp_3.0.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "lftp is a sophisticated command line based file \ transfer program. Supported protocols include FTP, HTTP, \ and FISH." diff --git a/packages/lftp/lftp_3.0.11.bb b/packages/lftp/lftp_3.0.11.bb index d15b119046..ae62962343 100644 --- a/packages/lftp/lftp_3.0.11.bb +++ b/packages/lftp/lftp_3.0.11.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "lftp is a sophisticated command line based file \ transfer program. Supported protocols include FTP, HTTP, \ and FISH." diff --git a/packages/liba52/liba52_0.7.4.bb b/packages/liba52/liba52_0.7.4.bb index cc66182d9a..f6894ab4d4 100644 --- a/packages/liba52/liba52_0.7.4.bb +++ b/packages/liba52/liba52_0.7.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Library for reading some sort of media format." SECTION = "libs" diff --git a/packages/libao/libao_0.8.4.bb b/packages/libao/libao_0.8.4.bb index 46ff7a938b..d77391fcb9 100644 --- a/packages/libao/libao_0.8.4.bb +++ b/packages/libao/libao_0.8.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "A cross platform audio library" HOMEPAGE = "http://www.xiph.org/ao/" SECTION = "libs" diff --git a/packages/libddmpeg/libddmpeg_1.5.bb b/packages/libddmpeg/libddmpeg_1.5.bb index 5cff182a88..69a8b8da7d 100644 --- a/packages/libddmpeg/libddmpeg_1.5.bb +++ b/packages/libddmpeg/libddmpeg_1.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "libs" SRC_URI = "http://nchipin.kos.to/libddmpeg/libddmpeg_1.5.orig.tar.gz" diff --git a/packages/libesmtp/libesmtp_1.0.3r1.bb b/packages/libesmtp/libesmtp_1.0.3r1.bb index abd76e1561..baff0d8931 100644 --- a/packages/libesmtp/libesmtp_1.0.3r1.bb +++ b/packages/libesmtp/libesmtp_1.0.3r1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "libs" DEPENDS = "openssl" DESCRIPTION = "LibESMTP is a library to manage posting \ diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb index c6ee08f9d4..172fecc8c7 100644 --- a/packages/libfakekey/libfakekey_svn.bb +++ b/packages/libfakekey/libfakekey_svn.bb @@ -7,7 +7,7 @@ PV = "0.0+svn${CVSDATE}" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" -S = ${WORKDIR}/${PN} +S = "${WORKDIR}/${PN}" inherit autotools pkgconfig gettext diff --git a/packages/libglade/libglade_2.0.1.bb b/packages/libglade/libglade_2.0.1.bb index 0cabe1781b..689f87261a 100644 --- a/packages/libglade/libglade_2.0.1.bb +++ b/packages/libglade/libglade_2.0.1.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Runtime support for GTK interface builder" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libglade/libglade_2.4.0.bb b/packages/libglade/libglade_2.4.0.bb index a4686f800b..57f55a879e 100644 --- a/packages/libglade/libglade_2.4.0.bb +++ b/packages/libglade/libglade_2.4.0.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Runtime support for GTK interface builder" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libglade/libglade_2.4.2.bb b/packages/libglade/libglade_2.4.2.bb index 5bf46b7d96..f7f75e501d 100644 --- a/packages/libglade/libglade_2.4.2.bb +++ b/packages/libglade/libglade_2.4.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Runtime support for GTK interface builder" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libglademm/libglademm_2.4.1.bb b/packages/libglademm/libglademm_2.4.1.bb index 512bdfad7e..4230d76717 100644 --- a/packages/libglademm/libglademm_2.4.1.bb +++ b/packages/libglademm/libglademm_2.4.1.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "C++ bindings for the libglade library." HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" diff --git a/packages/libgmime/libgmime_2.1.7.bb b/packages/libgmime/libgmime_2.1.7.bb index c741a1c5d0..64ce486dd6 100644 --- a/packages/libgmime/libgmime_2.1.7.bb +++ b/packages/libgmime/libgmime_2.1.7.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libgpepimc/libgpepimc-hildon_0.5.bb b/packages/libgpepimc/libgpepimc-hildon_0.5.bb index 007540d539..3442073573 100644 --- a/packages/libgpepimc/libgpepimc-hildon_0.5.bb +++ b/packages/libgpepimc/libgpepimc-hildon_0.5.bb @@ -11,7 +11,7 @@ RPROVIDES = "libgepepimc" SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2" EXTRA_OECONF = "--enable-hildon" -S = ${WORKDIR}/libgpepimc-${PV} +S = "${WORKDIR}/libgpepimc-${PV}" inherit pkgconfig autotools diff --git a/packages/libgpewidget/libgpewidget-hildon_0.102.bb b/packages/libgpewidget/libgpewidget-hildon_0.102.bb index 0c6739d449..74b99df262 100644 --- a/packages/libgpewidget/libgpewidget-hildon_0.102.bb +++ b/packages/libgpewidget/libgpewidget-hildon_0.102.bb @@ -11,7 +11,7 @@ RPROVIDES = "libgpewidget" SRC_URI = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2" -S = ${WORKDIR}/libgpewidget-${PV} +S = "${WORKDIR}/libgpewidget-${PV}" inherit pkgconfig autotools diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb new file mode 100644 index 0000000000..67efc38785 --- /dev/null +++ b/packages/libgphoto2/libgphoto2_2.1.6.bb @@ -0,0 +1,32 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/libgsf/libgsf_1.10.0.bb b/packages/libgsf/libgsf_1.10.0.bb index 4caea5d540..ce464feba9 100644 --- a/packages/libgsf/libgsf_1.10.0.bb +++ b/packages/libgsf/libgsf_1.10.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "libs" PR = "r1" diff --git a/packages/libgsf/libgsf_1.12.0.bb b/packages/libgsf/libgsf_1.12.0.bb index 54a17f42f6..2698639873 100644 --- a/packages/libgsf/libgsf_1.12.0.bb +++ b/packages/libgsf/libgsf_1.12.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "libs" PR = "r2" diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb index 177681ed5b..b8c5ec6966 100644 --- a/packages/libidl/libidl_0.8.2.bb +++ b/packages/libidl/libidl_0.8.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "libs" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2" S = "${WORKDIR}/libIDL-${PV}" diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index e349324a62..5a6f5800d6 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" SECTION = "gnome/libs" DEPENDS = "glib-2.0" diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/libmikey/libmikey0_0.3.2.bb index 524ef940ef..2f8ce60834 100644 --- a/packages/libmikey/libmikey0_0.3.2.bb +++ b/packages/libmikey/libmikey0_0.3.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" SECTION = "libs" diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb index 5e38783712..8d67fbf8f2 100644 --- a/packages/libmikey/libmikey0_svn.bb +++ b/packages/libmikey/libmikey0_svn.bb @@ -1,5 +1,5 @@ PV = "0.3.2svn${CVSDATE}" -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" SECTION = "libs" diff --git a/packages/libmikey/libmikey_0.1a.bb b/packages/libmikey/libmikey_0.1a.bb index 8ac0ee445d..a9389eaab7 100644 --- a/packages/libmikey/libmikey_0.1a.bb +++ b/packages/libmikey/libmikey_0.1a.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol." HOMEPAGE = "http://minisip.org/libmikey" SECTION = "libs" diff --git a/packages/libmnetutil/libmnetutil0_0.2.2.bb b/packages/libmnetutil/libmnetutil0_0.2.2.bb index de61bf2215..e201bf806b 100644 --- a/packages/libmnetutil/libmnetutil0_0.2.2.bb +++ b/packages/libmnetutil/libmnetutil0_0.2.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Networking class library for C++ programming" SECTION = "libs" diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb index 8f3334df04..1384cd5205 100644 --- a/packages/libmnetutil/libmnetutil0_svn.bb +++ b/packages/libmnetutil/libmnetutil0_svn.bb @@ -1,5 +1,5 @@ PV = "0.2.2svn${CVSDATE}" -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Networking class library for C++ programming" SECTION = "libs" diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/libmsip/libmsip0_0.2.2.bb index 2dbcd6e87e..64b5ae49c3 100644 --- a/packages/libmsip/libmsip0_0.2.2.bb +++ b/packages/libmsip/libmsip0_0.2.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" SECTION = "libs" diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb index b8550fb6ee..a0050e9e02 100644 --- a/packages/libmsip/libmsip0_svn.bb +++ b/packages/libmsip/libmsip0_svn.bb @@ -1,5 +1,5 @@ PV = "0.2.2svn${CVSDATE}" -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" SECTION = "libs" diff --git a/packages/libmutil/libmutil0_0.2.2.bb b/packages/libmutil/libmutil0_0.2.2.bb index b6feff53f4..381e4d5eb3 100644 --- a/packages/libmutil/libmutil0_0.2.2.bb +++ b/packages/libmutil/libmutil0_0.2.2.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Class library implementing utilities for C++ programming" SECTION = "libs" diff --git a/packages/libmutil/libmutil0_svn.bb b/packages/libmutil/libmutil0_svn.bb index 31145983a7..9e6a8f5d36 100644 --- a/packages/libmutil/libmutil0_svn.bb +++ b/packages/libmutil/libmutil0_svn.bb @@ -1,5 +1,5 @@ PV = "0.2.2svn${CVSDATE}" -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Class library implementing utilities for C++ programming" SECTION = "libs" diff --git a/packages/libnids/libnids_1.18.bb b/packages/libnids/libnids_1.18.bb index 3747bf4ca1..8323a7ec7d 100644 --- a/packages/libnids/libnids_1.18.bb +++ b/packages/libnids/libnids_1.18.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "libs" DEPENDS = "libnet libpcap" DESCRIPTION = "Libnids performs assembly of TCP segments \ diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 1ee7900fb8..75648b3c79 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -32,10 +32,15 @@ python __anonymous () { do_compile() { install -d ${STAGING_INCDIR}/opie2 install -d ${STAGING_INCDIR}/opie2/private - for i in `find . -name "*.h"` - do + for module in opiecore opiedb opiemm opienet opiepim opiesecurity opieui + do + cd $module + for i in `find . -name "*.h"` + do install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i` - done + done + cd .. + done for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h do diff --git a/packages/libtool/libtool_1.5.bb b/packages/libtool/libtool_1.5.bb index cc30f8c4b0..6c3f25eb21 100644 --- a/packages/libtool/libtool_1.5.bb +++ b/packages/libtool/libtool_1.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "devel" DESCRIPTION = "Generic library support script \ This is GNU libtool, a generic library support script. Libtool hides \ diff --git a/packages/libxine/libxine-opie_1.0.bb b/packages/libxine/libxine-opie_1.0.bb index a66ac08806..58fc07b8ba 100644 --- a/packages/libxine/libxine-opie_1.0.bb +++ b/packages/libxine/libxine-opie_1.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" # libxine OE build file # Modified by Advanced Micro Devices, Inc. diff --git a/packages/libxine/libxine_1.0.0-beta12.bb b/packages/libxine/libxine_1.0.0-beta12.bb index e9a93b68be..8227130e6f 100644 --- a/packages/libxine/libxine_1.0.0-beta12.bb +++ b/packages/libxine/libxine_1.0.0-beta12.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "libxine is a library for multimedia players. \ It plays back CDs, DVDs, and VCDs. It also decodes multimedia \ files like AVI, MOV, WMV, and MP3 from local disk drives, \ diff --git a/packages/libxine/libxine_1.0.0-rc5.bb b/packages/libxine/libxine_1.0.0-rc5.bb index f4666c72e6..dc6cea1b0f 100644 --- a/packages/libxine/libxine_1.0.0-rc5.bb +++ b/packages/libxine/libxine_1.0.0-rc5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "libxine" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb index 26e17fe688..5df28de0da 100644 --- a/packages/libxine/libxine_1.0.bb +++ b/packages/libxine/libxine_1.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "libxine" SECTION = "libs" diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/libxkbfile/libxkbfile_cvs.bb index e1452f20d3..6d26e88c74 100644 --- a/packages/libxkbfile/libxkbfile_cvs.bb +++ b/packages/libxkbfile/libxkbfile_cvs.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PV = "0.0cvs${CVSDATE}" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb index 9e6beffe9c..07e1ce32ed 100644 --- a/packages/libxss/libxss_cvs.bb +++ b/packages/libxss/libxss_cvs.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PV = "0.0cvs${CVSDATE}" PR = "r2" diff --git a/packages/libxv/libxv_2.2.2+cvs20040918.bb b/packages/libxv/libxv_2.2.2+cvs20040918.bb index e4f9789256..c0861cd8f9 100644 --- a/packages/libxv/libxv_2.2.2+cvs20040918.bb +++ b/packages/libxv/libxv_2.2.2+cvs20040918.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DEPENDS = "x11 xext" DESCRIPTION = "X Video extension library." diff --git a/packages/libxv/libxv_2.2.2.bb b/packages/libxv/libxv_2.2.2.bb index 656ac09fc9..63cb34033a 100644 --- a/packages/libxv/libxv_2.2.2.bb +++ b/packages/libxv/libxv_2.2.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/libs" DEPENDS = "x11 xext" DESCRIPTION = "X Video extension library." diff --git a/packages/links/links_2.1pre12.bb b/packages/links/links_2.1pre12.bb index b391252a65..ece8c928ab 100644 --- a/packages/links/links_2.1pre12.bb +++ b/packages/links/links_2.1pre12.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" DEPENDS = "jpeg libpng gpm flex openssl zlib" DESCRIPTION = "Links is graphics and text mode WWW \ diff --git a/packages/links/links_2.1pre14.bb b/packages/links/links_2.1pre14.bb index e7d333d009..4ece3dc08c 100644 --- a/packages/links/links_2.1pre14.bb +++ b/packages/links/links_2.1pre14.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" DEPENDS = "jpeg libpng gpm flex openssl zlib" DESCRIPTION = "Links is graphics and text mode WWW \ diff --git a/packages/linphone/linphone-hh_0.12.2.hh1.bb b/packages/linphone/linphone-hh_0.12.2.hh1.bb index 1e953dde03..54a79390a7 100644 --- a/packages/linphone/linphone-hh_0.12.2.hh1.bb +++ b/packages/linphone/linphone-hh_0.12.2.hh1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r4" diff --git a/packages/linphone/linphone_0.12.2.bb b/packages/linphone/linphone_0.12.2.bb index bb3e1cddc7..7a5e17a981 100644 --- a/packages/linphone/linphone_0.12.2.bb +++ b/packages/linphone/linphone_0.12.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r2" diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch new file mode 100644 index 0000000000..a2dbce3325 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch @@ -0,0 +1,10 @@ +--- linux-2.6.12/drivers/bluetooth/dtl1_cs.c.orig 2005-07-05 11:19:50.000000000 +0200 ++++ linux-2.6.12/drivers/bluetooth/dtl1_cs.c 2005-07-05 11:19:51.000000000 +0200 +@@ -810,6 +810,7 @@ + static struct pcmcia_device_id dtl1_ids[] = { + PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), + PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863), ++ PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3), + PCMCIA_DEVICE_NULL + }; + MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 725e130fcf..d93006ffa7 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -23,7 +23,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ ${RPSRC}/rndis_fix-r0.patch;patch=1 \ ${RPSRC}/w100_malloc-r2.patch;patch=1 \ - ${RPSRC}/pxairq_printk-r0.patch;patch=1 \ + ${RPSRC}/pxairq_printk-r0.patch;patch=1 \ ${RPSRC}/corgi_kbd-r14.patch;patch=1 \ ${RPSRC}/corgi_ts-r10.patch;patch=1 \ ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \ @@ -55,11 +55,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${DOSRC}/tosa-power-r2.patch;patch=1 \ ${DOSRC}/tosa-mmc-r2.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ - ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ + ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ - ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-collie \ file://defconfig-poodle \ diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index 00d3d891b9..fc519ecfbc 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -28,10 +28,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/machtype_update-r1.patch;patch=1 \ ${RPSRC}/collie_typofix-r0.patch;patch=1 \ ${RPSRC}/rmk_armsmp_fix-r0.patch;patch=1 \ - ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \ + ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \ ${RPSRC}/oprofile_trace-r3.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r0.patch;patch=1 \ - ${RPSRC}/w100_core-r0.patch;patch=1 \ + ${RPSRC}/w100_core-r0.patch;patch=1 \ ${RPSRC}/w100_corgi-r0.patch;patch=1 \ ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \ ${RPSRC}/corgi_kbd_susres-r0.patch;patch=1 \ @@ -48,7 +48,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ ${RPSRC}/pxa_i2c-r2.patch;patch=1 \ ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \ - ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ + ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r17.patch;patch=1 \ @@ -73,8 +73,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ - file://pxa-serial-hack.patch;patch=1 \ + file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + file://dtl1_cs-add-socket-revE.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa-2.6 \ file://defconfig-collie \ diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index 3855300e31..b1dc3d7081 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -35,7 +35,7 @@ SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-2 file://logo.patch;patch=1 \ file://initsh.patch;patch=1 \ file://disable-pcmcia-probe.patch;patch=1 \ - file://deviceinfo.patch;patch=1 \ + file://deviceinfo.patch;patch=1 \ file://corgi-fbcon-logo.patch;patch=1 \ file://corgi-default-brightness.patch;patch=1 \ file://1764-1.patch;patch=1 \ diff --git a/packages/lrzsz/lrzsz_0.12.20.bb b/packages/lrzsz/lrzsz_0.12.20.bb index be2104c05b..8110661ac1 100644 --- a/packages/lrzsz/lrzsz_0.12.20.bb +++ b/packages/lrzsz/lrzsz_0.12.20.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" PRIORITY = "standard" DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer" diff --git a/packages/lsh/lsh_1.5.5.bb b/packages/lsh/lsh_1.5.5.bb index c9d7ae864a..284a0100eb 100644 --- a/packages/lsh/lsh_1.5.5.bb +++ b/packages/lsh/lsh_1.5.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \ (version 2) protocol. It includes a server, a client, and some \ diff --git a/packages/lxt/lxt_1.0.bb b/packages/lxt/lxt_1.0.bb index 561d64a2bb..563b407f93 100644 --- a/packages/lxt/lxt_1.0.bb +++ b/packages/lxt/lxt_1.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "lxt ncurses filemanager xtree clone" PRIORITY = "optional" diff --git a/packages/maemo/nokia770-init/fixup-770.sh b/packages/maemo/nokia770-init/fixup-770.sh index 02c18d4108..b65fb131e3 100644 --- a/packages/maemo/nokia770-init/fixup-770.sh +++ b/packages/maemo/nokia770-init/fixup-770.sh @@ -4,6 +4,14 @@ case "$1" in echo -n "Unmounting virtual fs from initrd" umount /mnt/initfs/sys umount /mnt/initfs/proc + ln -s /dev/vc/0 /dev/tty0 + ln -s /dev/vc/1 /dev/tty1 + ln -s /dev/vc/2 /dev/tty2 + ln -s /dev/vc/3 /dev/tty3 + ln -s /dev/vc/4 /dev/tty4 + ln -s /dev/vc/5 /dev/tty5 + ln -s /dev/vc/6 /dev/tty6 + ln -s /dev/vc/7 /dev/tty7 ;; stop) ;; diff --git a/packages/maemo/nokia770-init_1.0.bb b/packages/maemo/nokia770-init_1.0.bb index 1cef924598..ab3333b438 100644 --- a/packages/maemo/nokia770-init_1.0.bb +++ b/packages/maemo/nokia770-init_1.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de" -PR = "r1" +PR = "r3" DEPENDS = "base-passwd hotplug-dbus" @@ -17,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults 01" do_install () { install -d ${D}${sysconfdir}/init.d - install -m 755 ${S}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh + install -m 755 ${WORKDIR}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh install -d ${D}/lib/firmware } @@ -31,7 +31,10 @@ if [ "x$D" != "x" ]; then fi # set up some links to firmware and modules in initrd - ln -sf /mnt/initfs/lib/firmware/* /lib/firmware/ + mkdir -p /lib/firmware + ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3825.arm /lib/firmware/3825.arm + ln -sf /mnt/initfs/usr/lib/hotplug/firmware/brf6150fw.bin /lib/firmware/brf6150fw.bin + ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3825.arm /lib/firmware/mtlm3825.arm rm -rf /lib/modules ln -s /mnt/initfs/lib/modules /lib/modules diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index 612b91462d..bf4fae08bc 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/gnome" PR = "r1" PROVIDES = "gnome-vfs" diff --git a/packages/man/man_1.5m2.bb b/packages/man/man_1.5m2.bb index 9d55486819..09cdc58d32 100644 --- a/packages/man/man_1.5m2.bb +++ b/packages/man/man_1.5m2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "base" DESCRIPTION = "The man page suite, including man, apropos, \ and whatis consists of programs that are used to read most \ diff --git a/packages/mbmerlin/mbmerlin_0.8.1-2.bb b/packages/mbmerlin/mbmerlin_0.8.1-2.bb index ce89d2101e..26d10abbef 100644 --- a/packages/mbmerlin/mbmerlin_0.8.1-2.bb +++ b/packages/mbmerlin/mbmerlin_0.8.1-2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r3" inherit pkgconfig gpe diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index 93e7c0b0a8..306d31a39e 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" PR = "r36" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" gpe-base-depends = "\ diet-x11 \ @@ -32,7 +32,7 @@ gpe-task-base = "\ gpe-autostarter \ libgtkstylus \ detect-stylus \ - teleport \ + teleport \ xauth" RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ @@ -102,4 +102,4 @@ DEPENDS += " ${gpe-task-games}" DEPENDS += "matchbox-themes-extra" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 6f8e886a22..17b9c66653 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -4,7 +4,7 @@ PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" maemo-base-depends = "\ diet-x11 \ @@ -80,7 +80,7 @@ maemo-task-apps = "\ hildon-home \ hildon-navigator \ hildon-control-panel \ - osso-application-installer \ + osso-application-installer \ osso-app-killer \ osso-screenshot-tool \ gpe-todo-hildon \ @@ -89,4 +89,4 @@ maemo-task-apps = "\ RDEPENDS_maemo-task-apps := "${maemo-task-apps}" DEPENDS += " ${maemo-task-apps}" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb index 6976699029..db9d86cdd6 100644 --- a/packages/meta/meta-sectest-gpe.bb +++ b/packages/meta/meta-sectest-gpe.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image" MAINTAINER = "Bob Davies tyggerbob@rogers.com>" PR = "r5" -ALLOW_EMPTY = 1 +ALLOW_EMPTY = "1" gpe-base-depends = "\ diet-x11 \ @@ -84,7 +84,7 @@ sectest-task-apps = "\ kismet \ hydra \ thcrut \ - driftnet \ + driftnet \ miniclipboard" RDEPENDS_sectest-task-apps := "${sectest-task-apps}" @@ -93,4 +93,4 @@ DEPENDS += " ${sectest-task-apps}" DEPENDS += "matchbox-themes-extra gtk-industrial-engine" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index a2b2e79bdb..c2d15dee58 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -36,7 +36,7 @@ OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \ OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \ openobex-apps libopieobex0 wireless-tools usbutils" OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \ - bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools usbutils" + bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools " # # Clamshell models can benefit from the autorotate applet @@ -98,5 +98,9 @@ def opie_more_rdepends(d): if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True ) else: return " " -OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}" -OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}" +OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}" + + + + +# # OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}" diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb index 7d533e3806..0b8211cb8a 100644 --- a/packages/meta/pivotboot-image.bb +++ b/packages/meta/pivotboot-image.bb @@ -12,6 +12,6 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ - opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie \ + opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" -LICENSE = MIT +LICENSE = "MIT" diff --git a/packages/minilite/minilite_0.41.bb b/packages/minilite/minilite_0.41.bb index b68c5138c0..0f5b126043 100644 --- a/packages/minilite/minilite_0.41.bb +++ b/packages/minilite/minilite_0.41.bb @@ -7,4 +7,4 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/minilite/minilite_0.43.bb b/packages/minilite/minilite_0.43.bb index b68c5138c0..0f5b126043 100644 --- a/packages/minilite/minilite_0.43.bb +++ b/packages/minilite/minilite_0.43.bb @@ -7,4 +7,4 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/minilite/minilite_0.44.bb b/packages/minilite/minilite_0.44.bb index b68c5138c0..0f5b126043 100644 --- a/packages/minilite/minilite_0.44.bb +++ b/packages/minilite/minilite_0.44.bb @@ -7,4 +7,4 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/minilite/minilite_0.47.bb b/packages/minilite/minilite_0.47.bb index b68c5138c0..0f5b126043 100644 --- a/packages/minilite/minilite_0.47.bb +++ b/packages/minilite/minilite_0.47.bb @@ -7,4 +7,4 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/minilite/minilite_0.48.bb b/packages/minilite/minilite_0.48.bb index b68c5138c0..0f5b126043 100644 --- a/packages/minilite/minilite_0.48.bb +++ b/packages/minilite/minilite_0.48.bb @@ -7,4 +7,4 @@ DESCRIPTION = "GPE Screen light control dockapp" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" -export CVSBUILD=no +export CVSBUILD="no" diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb index cc9adf0e97..ff31906ba7 100644 --- a/packages/minisip/minisip-video_svn.bb +++ b/packages/minisip/minisip-video_svn.bb @@ -1,5 +1,5 @@ PV = "0.6.2svn${CVSDATE}" -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" diff --git a/packages/minisip/minisip_0.6.2.bb b/packages/minisip/minisip_0.6.2.bb index 9ed59740f9..3876c04029 100644 --- a/packages/minisip/minisip_0.6.2.bb +++ b/packages/minisip/minisip_0.6.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb index 4c67124ac9..99660655d9 100644 --- a/packages/minisip/minisip_svn.bb +++ b/packages/minisip/minisip_svn.bb @@ -1,5 +1,5 @@ PV = "0.6.2svn${CVSDATE}" -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" PR = "r0" MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" diff --git a/packages/modplugplay/modplugplay_1.0.bb b/packages/modplugplay/modplugplay_1.0.bb index 3e396eae99..47c7aa4e06 100644 --- a/packages/modplugplay/modplugplay_1.0.bb +++ b/packages/modplugplay/modplugplay_1.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "modplugplay is a commandline mod-like audio file player." SECTION = "console/multimedia" MAINTAINER = "Michael 'Mickey' Lauer" diff --git a/packages/kdepimpi/files/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kdepimpi/files/.mtn2git_empty +++ b/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory new file mode 100644 index 0000000000..185ea7a3a5 --- /dev/null +++ b/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory @@ -0,0 +1,24 @@ +diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 +--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 +@@ -31,6 +31,7 @@ + \fI/etc/modprobe.conf\fR configuration file and + \fI/etc/modprobe.d\fR directory + (see \fBmodprobe.conf\fR(5)). ++All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. + .PP + Note that this version of \fBmodprobe\fR does not + do anything to the module itself: the work of resolving symbols +--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 +@@ -1158,6 +1158,10 @@ + DIR *dir; + int ret = 0; + ++ /* ignore everything in this directory */ ++ if (streq(filename, "/etc/modprobe.d/arch")) ++ return 1; ++ + /* Reiser4 has file/directory duality: treat it as both. */ + dir = opendir(filename); + if (dir) { diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt new file mode 100644 index 0000000000..ee1454c6ef --- /dev/null +++ b/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt @@ -0,0 +1,39 @@ +Index: module-init-tools-3.1/configure.in +=================================================================== +--- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 ++++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 +@@ -41,5 +41,14 @@ + fi]) + AC_SUBST(MODULE_DIR) + +-AC_OUTPUT([Makefile]) ++AC_ARG_ENABLE(manpages, ++[ --disable-manpages Disable man page generation.], ++[if test x"$enableval" != x"no"; then ++ enable_manpages=yes ++else ++ enable_manpages=no ++fi], ++[enable_manpages=yes]) ++AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") + ++AC_OUTPUT([Makefile]) +--- module-init-tools-3.2-pre7/Makefile.am.orig 2005-07-05 13:55:06.000000000 +0200 ++++ module-init-tools-3.2-pre7/Makefile.am 2005-07-05 13:55:31.000000000 +0200 +@@ -21,13 +21,14 @@ + MAN5 = modprobe.conf.5 modules.dep.5 + MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 + SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) +-man_MANS = $(MAN5) $(MAN8) + # If they haven't overridden mandir, fix it (never /man!) + mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) + + TESTSUITE := $(shell find tests -type f ! -name '*~') + +-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) ++if MANPAGES ++man_MANS = $(MAN5) $(MAN8) ++endif + + sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static + bin_PROGRAMS = lsmod diff --git a/packages/module-init-tools/module-init-tools-cross_3.1.bb b/packages/module-init-tools/module-init-tools-cross_3.1.bb index ce3c232df2..56fec56072 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.1.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.1.bb @@ -1,10 +1,10 @@ -LICENSE = GPL +LICENSE = "GPL" include module-init-tools_${PV}.bb inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" -PR=r3 +PR="r3" # When cross compiling depmod as shipped cannot handle endian # differences between host and target, this fixes the problem. diff --git a/packages/module-init-tools/module-init-tools_3.1.bb b/packages/module-init-tools/module-init-tools_3.1.bb index 25db614ed6..62523f513a 100644 --- a/packages/module-init-tools/module-init-tools_3.1.bb +++ b/packages/module-init-tools/module-init-tools_3.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "base" DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ diff --git a/packages/module-init-tools/module-init-tools_3.2-pre4.bb b/packages/module-init-tools/module-init-tools_3.2-pre4.bb index 90da33addb..41aea223fe 100644 --- a/packages/module-init-tools/module-init-tools_3.2-pre4.bb +++ b/packages/module-init-tools/module-init-tools_3.2-pre4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." -LICENSE = GPL +LICENSE = "GPL" SECTION = "base" PR = "r0" diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre7.bb new file mode 100644 index 0000000000..41aea223fe --- /dev/null +++ b/packages/module-init-tools/module-init-tools_3.2-pre7.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +removing kernel modules for Linux (versions 2.5.48 and above). It serves \ +the same function that the modutils package serves for Linux 2.4." +LICENSE = "GPL" +SECTION = "base" +PR = "r0" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ + file://ignore_arch_directory;patch=1 \ + file://modutils_extension;patch=1 \ + file://no_man_rebuild;patch=1 \ + file://manpagesopt;patch=1 " +S = "${WORKDIR}/module-init-tools-${PV}" + +EXTRA_OECONF = "--disable-manpages" + +bindir = "/bin" +sbindir = "/sbin" + +inherit autotools + +do_install() { + autotools_do_install + for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do + mv ${D}/$f ${D}/$f.26 + done +} + +pkg_postinst_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +bn=`basename $f` + update-alternatives --install /$f $bn /$f.26 20 +done +} + +pkg_prerm_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +bn=`basename $f` + update-alternatives --remove $bn /$f.26 +done +} + +pkg_postinst_module-init-tools-depmod() { +#!/bin/sh +update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 +} + +pkg_prerm_module-init-tools() { +#!/bin/sh +update-alternatives --remove depmod /sbin/depmod.26 +} diff --git a/packages/mp3blaster/mp3blaster_3.1.3.bb b/packages/mp3blaster/mp3blaster_3.1.3.bb index 0e387ab381..2f748e958e 100644 --- a/packages/mp3blaster/mp3blaster_3.1.3.bb +++ b/packages/mp3blaster/mp3blaster_3.1.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/multimedia" DESCRIPTION = "A console MP3 player based on ncurses" DEPENDS = "ncurses libsidplay libogg libvorbis" diff --git a/packages/mp3blaster/mp3blaster_3.2.0.bb b/packages/mp3blaster/mp3blaster_3.2.0.bb index 0e387ab381..2f748e958e 100644 --- a/packages/mp3blaster/mp3blaster_3.2.0.bb +++ b/packages/mp3blaster/mp3blaster_3.2.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/multimedia" DESCRIPTION = "A console MP3 player based on ncurses" DEPENDS = "ncurses libsidplay libogg libvorbis" diff --git a/packages/mysql/mysql_4.1.12.bb b/packages/mysql/mysql_4.1.12.bb index a1173158ee..9805936670 100644 --- a/packages/mysql/mysql_4.1.12.bb +++ b/packages/mysql/mysql_4.1.12.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The MySQL Open Source Database System" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SECTION = "libs" DEPENDS += "ncurses mysql-native" -PR = "r1" +PR = "r2" LICENSE = "GPL" SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -15,7 +15,7 @@ inherit autotools EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" -EXTRA_OECONF = " --with-embedded-server --prefix=/usr --datadir=/var/share --sysconfdir=/etc --localstatedir=/var/state --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " +EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " do_stage() { autotools_stage_includes diff --git a/packages/nano/nano_1.2.1.bb b/packages/nano/nano_1.2.1.bb index 9ff3e899d9..fbd36d8aef 100644 --- a/packages/nano/nano_1.2.1.bb +++ b/packages/nano/nano_1.2.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ Not ANOther editor) is an enhanced clone of the \ Pico text editor." -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DEPENDS = "ncurses" diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index f37e76f071..068fb315ad 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -1,8 +1,8 @@ DESCRIPTION = "userspace utilities for kernel nfs" -PRIORITY = "optional +PRIORITY = "optional" SECTION = "console/networking" MAINTAINER = "dyoung <dyoung@thestuffguy.com>" -LICENSE = GPL +LICENSE = "GPL" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ diff --git a/packages/nis/ypbind-mt_1.19.bb b/packages/nis/ypbind-mt_1.19.bb new file mode 100644 index 0000000000..e58daa6670 --- /dev/null +++ b/packages/nis/ypbind-mt_1.19.bb @@ -0,0 +1,21 @@ +# This package builds the NIS ypbind daemon +# The source package is utils/net/NIS/ypbind-mt +# +PR = "r0" +DESCRIPTION="\ +Multithreaded NIS bind service (ypbind-mt). \ +ypbind-mt is a complete new implementation of a NIS \ +binding daemon for Linux. It has the following \ +features. Supports ypbind protocol V1 and V2. \ +Uses threads for better response. Supports multiple \ +domain bindings. Supports /var/yp/binding/* file \ +for Linux libc 4/5 and glibc 2.x. Supports a list \ +of known secure NIS server (/etc/yp.conf) Binds to \ +the server which answered as first." +HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" + +include nis.inc + +# ypbind-mt now provides all the functionality of ypbind +# and is used in place of it. +PROVIDES += "ypbind" diff --git a/packages/nonworking/freenote/freenote_1.6.1.bb b/packages/nonworking/freenote/freenote_1.6.1.bb index dacafdb365..d8ada414e9 100644 --- a/packages/nonworking/freenote/freenote_1.6.1.bb +++ b/packages/nonworking/freenote/freenote_1.6.1.bb @@ -14,9 +14,9 @@ do_configure_prepend() { } do_install() { - install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics} - install -D -m 755 freenoteeintu ${D}/opt/QtPalmtop/bin/freenoteeintu - install -D -m 644 ${FILESDIR}/freenoteeintu.desktop ${D}/opt/QtPalmtop/apps/Applications/freenoteeintu.desktop - install -d ${D}/opt/QtPalmtop/pics - cp -a *.png ${D}/opt/QtPalmtop/pics/ + install -d ${D}${palmtopdir}/{bin,apps/Applications,pics} + install -D -m 755 freenoteeintu ${D}${palmtopdir}/bin/freenoteeintu + install -D -m 644 ${FILESDIR}/freenoteeintu.desktop ${D}${palmtopdir}/apps/Applications/freenoteeintu.desktop + install -d ${D}/${palmtopdir}/pics + cp -a *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/nonworking/qualendar/qualendar_0.8.0.bb b/packages/nonworking/qualendar/qualendar_0.8.0.bb index a6a73f19d8..3a4bb15e35 100644 --- a/packages/nonworking/qualendar/qualendar_0.8.0.bb +++ b/packages/nonworking/qualendar/qualendar_0.8.0.bb @@ -9,9 +9,9 @@ S = ${WORKDIR}/${PN}/src inherit palmtop do_install() { - install -d ${D}/opt/QtPalmtop/{bin,apps/Applications,pics} - install -D -m 755 qualendar ${D}/opt/QtPalmtop/bin/qualendar - install -D -m 644 qualendar.desktop ${D}/opt/QtPalmtop/apps/Applications/qualendar.desktop - install -d ${D}/opt/QtPalmtop/pics - cp -a *.png ${D}/opt/QtPalmtop/pics/ + install -d ${D}${palmtopdir}/{bin,apps/Applications,pics} + install -D -m 755 qualendar ${D}${palmtopdir}/bin/qualendar + install -D -m 644 qualendar.desktop ${D}${palmtopdir}/apps/Applications/qualendar.desktop + install -d ${D}${palmtopdir}/pics + cp -a *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/ntop/ntop_3.0.bb b/packages/ntop/ntop_3.0.bb index 1fd10cf8f4..051b5beb91 100644 --- a/packages/ntop/ntop_3.0.bb +++ b/packages/ntop/ntop_3.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "ntop is network top" SECTION = "console/network" PRIORITY = "optional" diff --git a/packages/obexftp/obexftp_0.10.3.bb b/packages/obexftp/obexftp_0.10.3.bb index ac2245ee66..0703eb08b5 100644 --- a/packages/obexftp/obexftp_0.10.3.bb +++ b/packages/obexftp/obexftp_0.10.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "OBEX Ftp Client" SECTION = "console/network" PRIORITY = "optional" diff --git a/packages/octave/octave_2.1.63.bb b/packages/octave/octave_2.1.63.bb index ec2a8f059d..0dcb2c7e77 100644 --- a/packages/octave/octave_2.1.63.bb +++ b/packages/octave/octave_2.1.63.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \ It provides a convenient command line interface for solving linear and nonlinear problems numerically, \ and for performing other numerical experiments using a language that is mostly compatible with Matlab. \ diff --git a/packages/olsr/olsr_0.3-1.bb b/packages/olsr/olsr_0.3-1.bb index f2a3bbe497..276e7b489d 100644 --- a/packages/olsr/olsr_0.3-1.bb +++ b/packages/olsr/olsr_0.3-1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" DESCRIPTION = "OLSR - routing protocol for wireless network" PRIORITY = "optional" diff --git a/packages/omnievents/omnievents_2.6.1.bb b/packages/omnievents/omnievents_2.6.1.bb index 482ae837d5..779dd9a84e 100644 --- a/packages/omnievents/omnievents_2.6.1.bb +++ b/packages/omnievents/omnievents_2.6.1.bb @@ -1,5 +1,5 @@ PR = "r0" -DESCRIPTION = "OmniEvent service for omniORB +DESCRIPTION = "OmniEvent service for omniORB" SECTION = "devel" PRIORITY = "optional" MAINTAINER = "Philip Balister <philip@balister.org>" diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index 033f959510..37173e58c7 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -10,7 +10,7 @@ PR="r1" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ file://adjtimex-${PV}.patch;patch=1 \ - file://makefile-install.patch;patch=1 \ + file://makefile-install.patch;patch=1 \ file://init" S = "${WORKDIR}/openntpd-${PV}" diff --git a/packages/openobex-apps/openobex-apps_1.0.0.bb b/packages/openobex-apps/openobex-apps_1.0.0.bb index f7e98538b0..5fee78ce9b 100644 --- a/packages/openobex-apps/openobex-apps_1.0.0.bb +++ b/packages/openobex-apps/openobex-apps_1.0.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Applications for OpenOBEX" SECTION = "console/network" PRIORITY = "optional" diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb index 17cfe8dca6..c3b1562e8d 100644 --- a/packages/openobex/openobex_1.0.1.bb +++ b/packages/openobex/openobex_1.0.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "The Openobex project aims to make an \ open source implementation of the Object Exchange \ (OBEX) protocol." diff --git a/packages/openswan/openswan_2.1.2.bb b/packages/openswan/openswan_2.1.2.bb index 3346445b86..cf0671729b 100644 --- a/packages/openswan/openswan_2.1.2.bb +++ b/packages/openswan/openswan_2.1.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \ Linux operating system." diff --git a/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb index b5cbf3f010..c8a3e2b7d7 100644 --- a/packages/pango/pango_1.2.5.bb +++ b/packages/pango/pango_1.2.5.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/libs" DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt" DESCRIPTION = "The goal of the Pango project is to provide an \ diff --git a/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb index f65e23ea72..fc7bb8167b 100644 --- a/packages/pango/pango_1.4.0.bb +++ b/packages/pango/pango_1.4.0.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt" diff --git a/packages/pango/pango_1.4.1.bb b/packages/pango/pango_1.4.1.bb index 3d3569fbde..925eee2566 100644 --- a/packages/pango/pango_1.4.1.bb +++ b/packages/pango/pango_1.4.1.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc" diff --git a/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb index 081dd7d158..8180710bac 100644 --- a/packages/pango/pango_1.8.0.bb +++ b/packages/pango/pango_1.8.0.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc" diff --git a/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb index 081dd7d158..8180710bac 100644 --- a/packages/pango/pango_1.8.1.bb +++ b/packages/pango/pango_1.8.1.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc" diff --git a/packages/pcmciautils/pcmciautils_005.bb b/packages/pcmciautils/pcmciautils_005.bb new file mode 100644 index 0000000000..ad8cf7e2f4 --- /dev/null +++ b/packages/pcmciautils/pcmciautils_005.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "2.6 pcmcia utilities" +DEPENDS = "sysfsutils" +SECTION = "kernel/userland" +PRIORITY = "optional" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" +S = "${WORKDIR}/pcmciautils-${PV}" + +inherit update-rc.d + +INITSCRIPT_NAME = "coldplug" +INITSCRIPT_PARAMS = "defaults" + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export hotplugdir = "${sysconfdir}/hotplug" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/plinciv/plinciv_0.16.bb b/packages/plinciv/plinciv_0.16.bb index 3627c1ae75..073515f0d7 100644 --- a/packages/plinciv/plinciv_0.16.bb +++ b/packages/plinciv/plinciv_0.16.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/games" DEPENDS = "gtk+" DESCRIPTION = "Embedded version of a popular FreeCiv game" diff --git a/packages/procps/procps_3.1.15.bb b/packages/procps/procps_3.1.15.bb index 892b88a876..12d6a43fd2 100644 --- a/packages/procps/procps_3.1.15.bb +++ b/packages/procps/procps_3.1.15.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Procps is the package that has a bunch \ of small useful utilities that give information \ about processes using the /proc filesystem. The package \ diff --git a/packages/procps/procps_3.2.1.bb b/packages/procps/procps_3.2.1.bb index 4796bbf7bf..3c0aaf547a 100644 --- a/packages/procps/procps_3.2.1.bb +++ b/packages/procps/procps_3.2.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Procps is the package that has a bunch \ of small useful utilities that give information \ about processes using the /proc filesystem. The package \ diff --git a/packages/psmisc/psmisc_20.2.bb b/packages/psmisc/psmisc_20.2.bb index 2f36f83dc4..10169c03e4 100644 --- a/packages/psmisc/psmisc_20.2.bb +++ b/packages/psmisc/psmisc_20.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "procfs tools" SECTION = "base" PRIORITY = "required" diff --git a/packages/python/python-ao_0.82.bb b/packages/python/python-ao_0.82.bb index 6c23a87b96..368c01fd87 100644 --- a/packages/python/python-ao_0.82.bb +++ b/packages/python/python-ao_0.82.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Python AO Bindings" SECTION = "devel/python" PRIORITY = "optional" diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk-0_0.6.12.bb index bb28f1f123..3c9dc3a895 100644 --- a/packages/python/python-pygtk-0_0.6.12.bb +++ b/packages/python/python-pygtk-0_0.6.12.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" DESCRIPTION = "Python GTK+ 1.2 Bindings" SECTION = "devel/python" PRIORITY = "optional" diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_0.9.17.bb index d90875f75e..3d0d09d574 100644 --- a/packages/python/python-scapy_0.9.17.bb +++ b/packages/python/python-scapy_0.9.17.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Scapy is a powerful interactive packet manipulation tool, \ packet generator, network scanner, network discovery, packet sniffer, etc. \ It can for the moment replace hping, 85% of nmap, arpspoof, arp-sk, arping, \ diff --git a/packages/qpe-gaim/qpe-libgaim_1.3.1.bb b/packages/qpe-gaim/qpe-libgaim_1.4.0.bb index 824dee5c39..824dee5c39 100644 --- a/packages/qpe-gaim/qpe-libgaim_1.3.1.bb +++ b/packages/qpe-gaim/qpe-libgaim_1.4.0.bb diff --git a/packages/qte/qte-2.3.10/c7x0-w100-accel.patch b/packages/qte/qte-2.3.10/c7x0-w100-accel.patch index f1d52066a8..0399e18b9d 100644 --- a/packages/qte/qte-2.3.10/c7x0-w100-accel.patch +++ b/packages/qte/qte-2.3.10/c7x0-w100-accel.patch @@ -648,7 +648,7 @@ Manuel Teira <manuel.teira@telefonica.net> +#endif --- /dev/null +++ qt-2.3.10/src/kernel/qgfxw100_qws.cpp -@@ -0,0 +1,2283 @@ +@@ -0,0 +1,2514 @@ + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil -*- */ +/*************************************************************************** + @@ -680,7 +680,7 @@ Manuel Teira <manuel.teira@telefonica.net> + +#include <stdarg.h> + -+class W100Control { ++class W100Driver { +public: + + typedef enum Loglevel { @@ -700,6 +700,12 @@ Manuel Teira <manuel.teira@telefonica.net> + EOO + }; + ++ typedef enum Retcodes { ++ codOK, ++ codError ++ }; ++ ++ + typedef struct Opcode { + QString str; + int index; @@ -728,19 +734,20 @@ Manuel Teira <manuel.teira@telefonica.net> + } + } + -+ W100Control(): ++ W100Driver(): + m_loglevel( 0 ), -+ m_enabled( 0 ) ++ m_logenabled( 0 ), ++ m_attached( false ) + { + m_loglevel = 0; + char *var; + if ( var = getenv( "W100_DEBUG" ) ) { + if ( strtol( var, 0, 0 ) == 1 ) { -+ m_enabled = 1; ++ m_logenabled = 1; + } + } + -+ if ( m_enabled ) { ++ if ( m_logenabled ) { + if ( var = getenv( "W100_DEBUGLEVEL" ) ) { + if ( ( m_loglevel = strtol( var, 0, 0 ) ) < 0 ) { + m_loglevel = 0; @@ -752,7 +759,7 @@ Manuel Teira <manuel.teira@telefonica.net> + path = QString( var ) + "/w100debug.log"; + } + m_logfile = fopen( path.latin1(), "a" ); -+ if ( m_logfile == NULL ) m_enabled = 0; ++ if ( m_logfile == NULL ) m_logenabled = 0; + } + + Opcode *opcodePtr = lOpcodes; @@ -769,7 +776,7 @@ Manuel Teira <manuel.teira@telefonica.net> + } + } + -+ ~W100Control() ++ ~W100Driver() + { + //Dump statistics about any opcode + Opcode *opcodePtr = lOpcodes; @@ -781,13 +788,14 @@ Manuel Teira <manuel.teira@telefonica.net> + opcodePtr->misses ); + opcodePtr++; + } -+ if ( m_enabled && m_logfile ) { ++ if ( m_logenabled && m_logfile ) { + fclose( m_logfile ); + } + } + + bool accelerated( int opcode ) + { ++ if ( !m_attached ) return false; + if ( opcode < EOO ) { + return lOpcodes[opcode].accelerated; + } @@ -806,7 +814,7 @@ Manuel Teira <manuel.teira@telefonica.net> + + void log( int level, const char *fmt, ... ) + { -+ if ( m_enabled && ( level <= m_loglevel ) ) { ++ if ( m_logenabled && ( level <= m_loglevel ) ) { + char buffer[1024]; + va_list ap; + va_start( ap, fmt ); @@ -819,234 +827,434 @@ Manuel Teira <manuel.teira@telefonica.net> + } + } + -+private: -+ FILE *m_logfile; -+ int m_loglevel; -+ bool m_enabled; -+}; + -+W100Control::Opcode W100Control::lOpcodes[] = { -+ { "DRAWLINE", W100Control::DRAWLINE, true, 0, 0 }, -+ { "DRAWPOINT", W100Control::DRAWPOINT, true, 0, 0 }, -+ { "DRAWPOINTS", W100Control::DRAWPOINTS, true, 0, 0 }, -+ { "FILLRECT", W100Control::FILLRECT, true, 0, 0 }, -+ { "SCROLL", W100Control::SCROLL, true, 0, 0 }, -+ { "BITBLT", W100Control::BITBLT, true, 0, 0 }, -+ { "POLYLINE", W100Control::POLYLINE, true, 0, 0 }, -+ { "" , W100Control::EOO, false, 0, 0 } -+}; ++ int processAttach( void ) ++ { ++ if ( !m_attached ) { ++ if ( AtiCore_ProcessAttach() ) { ++ m_attached = true; ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+W100Control control; ++ int processDetach( void ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_ProcessDetach() ) { ++ m_attached = false; ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_ProcessAttach( void ) -+{ -+ return( AtiCore_ProcessAttach() ); -+} ++ int allocateSurface( uint16_t *handle, uint32_t *offset, ++ uint32_t size, uint32_t direction ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_AllocateSurface( handle, offset, ++ size, direction ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_ProcessDetach( void ) -+{ -+ return( AtiCore_ProcessDetach() ); -+} ++ int destroySurface( uint16_t handle ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_DestroySurface( handle ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_AllocateSurface( uint16_t *handle, uint32_t *offset, -+ uint32_t size, uint32_t direction ) -+{ -+ return( AtiCore_AllocateSurface( handle, offset, size, direction ) ); -+} ++ int drawPixel( int npoints, ATI_POINT *points ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_DrawPixel( npoints, points ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_DestroySurface( uint16_t handle ) -+{ -+ return( AtiCore_DestroySurface( handle ) ); -+} ++ int setRopOperation( uint32_t rop ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetRopOperation( rop ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_DrawPixel( int npoints, ATI_POINT *points ) -+{ -+ return( AtiCore_DrawPixel( npoints, points ) ); -+} ++ int setDstType( uint32_t dtype ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetDstType( dtype ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetRopOperation( uint32_t rop ) -+{ -+ return( AtiCore_SetRopOperation( rop ) ); -+} ++ int setSrcType( uint32_t stype ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetSrcType( stype ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetDstType( uint32_t dtype ) -+{ -+ return( AtiCore_SetDstType( dtype ) ); -+} ++ int setSrcClippingRect( ATI_CLIPRECT *cliprect ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetSrcClippingRect( cliprect ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetSrcType( uint32_t stype ) -+{ -+ return( AtiCore_SetSrcType( stype ) ); -+} ++ int setDstClippingRect( ATI_CLIPRECT *cliprect ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetDstClippingRect( cliprect ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetSrcClippingRect( ATI_CLIPRECT *cliprect ) -+{ -+ return( AtiCore_SetSrcClippingRect( cliprect ) ); -+} ++ int setSrcPitchOffset( int pitch, int offset ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetSrcPitchOffset( pitch, offset ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetDstClippingRect( ATI_CLIPRECT *cliprect ) -+{ -+ return( AtiCore_SetDstClippingRect( cliprect ) ); -+} ++ int setDstPitchOffset( int pitch, int offset ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetDstPitchOffset( pitch, offset ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetSrcPitchOffset( int pitch, int offset ) -+{ -+ return( AtiCore_SetSrcPitchOffset( pitch, offset ) ); -+} ++ int bitBltFlipRotate( int rot, ++ ATI_RECT *dstRect, ++ ATI_RECT *srcRect ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_BitBltFilpRotate( rot, dstRect, srcRect ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetDstPitchOffset( int pitch, int offset ) -+{ -+ return( AtiCore_SetDstPitchOffset( pitch, offset ) ); -+} ++ int stretchBlt( ATI_STRETCH *option, ++ ATI_POINT *point, ++ ATI_RECT *srcRect ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_StretchBlt( option, point, srcRect ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_BitBltFilpRotate( int flags, -+ ATI_RECT *dstRect, -+ ATI_RECT *srcRect ) -+{ -+ return( AtiCore_BitBltFilpRotate( flags, dstRect, srcRect ) ); -+} ++ int waitComplete( int msec ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_WaitComplete( msec ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_StretchBlt( ATI_STRETCH *option, -+ ATI_POINT *point, -+ ATI_RECT *srcRect ) -+{ -+ return( AtiCore_StretchBlt( option, point, srcRect ) ); -+} ++ int allocOverlay( uint16_t *handle ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_AllocOverlay( handle ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_WaitComplete( int msec ) -+{ -+ return( AtiCore_WaitComplete( msec ) ); -+} ++ int releaseOverlay( uint16_t handle ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_ReleaseOverlay( handle ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_AllocOverlay( uint16_t *handle ) -+{ -+ return( AtiCore_AllocOverlay( handle ) ); -+} ++ int setupOverlay( uint16_t handle, ATI_OVERLAYPROP *prop ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetupOverlay( handle, prop ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_ReleaseOverlay( uint16_t handle ) -+{ -+ return( AtiCore_ReleaseOverlay( handle ) ); -+} ++ int setupOverlayExtended( uint16_t handle, ++ ATI_EXTENDEDOVERLAYPROP *prop ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetupOverlayExtended( handle, prop ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetupOverlay( uint16_t handle, ATI_OVERLAYPROP *prop ) -+{ -+ return( AtiCore_SetupOverlay( handle, prop ) ); -+} ++ int setOverlayOnOff( uint16_t handle, int isShow ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetOverlayOnOff( handle, isShow ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetupOverlayExtended( uint16_t handle, ATI_EXTENDEDOVERLAYPROP *prop ) -+{ -+ return( AtiCore_SetupOverlayExtended( handle, prop ) ); -+} ++ int setOverlayPos( uint16_t handle, uint16_t x, uint16_t y ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetOverlayPos( handle, x, y ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetOverlayOnOff( uint16_t handle, int isShow ) -+{ -+ return( AtiCore_SetOverlayOnOff( handle, isShow ) ); -+} ++ int setupMemoryTransfer( uint32_t offset, uint32_t *regdata ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetupMemoryTransfer( offset, regdata ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetOverlayPos( uint16_t handle, uint16_t x, uint16_t y ) -+{ -+ return( AtiCore_SetOverlayPos( handle, x, y ) ); -+} ++ int terminateMemoryTransfer( void ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_TerminateMemoryTransfer() ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetupMemoryTransfer( uint32_t offset, uint32_t *regdata ) -+{ -+ return( AtiCore_SetupMemoryTransfer( offset, regdata ) ); -+} ++ int getFrontBufferPitchOffset( uint32_t *pitch, uint32_t *offset ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_GetFrontBufferPitchOffset( pitch, offset ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_TerminateMemoryTransfer( void ) -+{ -+ return( AtiCore_TerminateMemoryTransfer() ); -+} ++ int setDisplayBrightness( int bri ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetDisplayBrightness( bri ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_GetFrontBufferPitchOffset( uint32_t *pitch, uint32_t *offset ) -+{ -+ return( AtiCore_GetFrontBufferPitchOffset( pitch, offset ) ); -+} ++ int getAvailableVideoMem( uint32_t *internal, uint32_t *external ) ++ { ++ if ( m_attached ) { ++ if ( GetAvailableVideoMem( internal, external ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetDisplayBrightness( int bri ) -+{ -+ return( AtiCore_SetDisplayBrightness( bri ) ); -+} ++ int setupGraphicWindow( ATI_GRAPHICWINDOW *win ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetupGraphicWindow( ( void * ) win ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_GetAvailableVideoMem( uint32_t *internal, uint32_t *external ) -+{ -+ return( GetAvailableVideoMem( internal, external ) ); -+} ++ int processAttachSpecialMode( int mode ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_ProcessAttachSpecialMode( mode ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetupGraphicWindow( ATI_GRAPHICWINDOW *win ) -+{ -+ return( AtiCore_SetupGraphicWindow( ( void * ) win ) ); -+} ++ int setGraphicWindowPos( int x, int y ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetGraphicWindowPos( x, y ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_ProcessAttachSpecialMode( int mode ) -+{ -+ return( AtiCore_ProcessAttachSpecialMode( mode ) ); -+} ++ int setFrontBuffer( int offset, int a, int b ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetFrontBuffer( offset, a, b ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetGraphicWindowPos( int x, int y ) -+{ -+ return( AtiCore_SetGraphicWindowPos( x, y ) ); -+} ++ int setGraphicWindowOnOff( int val ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetGraphicWindowOnOff( val ) ) { ++ return codOK; ++ } ++ } ++ } + -+static int W100_SetFrontBuffer( int offset, int a, int b ) -+{ -+ return( AtiCore_SetFrontBuffer( offset, a, b ) ); -+} ++ static unsigned long ccolor( unsigned int rgb ) ++ { ++ unsigned char r = ( rgb & 0xff0000 ) >> 19; ++ unsigned char g = ( rgb & 0xff00 ) >> 10; ++ unsigned char b = ( rgb & 0xff ) >> 3; ++ return ( ( ( ( unsigned short )0x1f & r ) << 11 ) | ++ ( ( ( unsigned short )0x3f & g ) << 5 ) | ++ ( ( ( unsigned short )0x1f & b ) ) ); ++ } + -+static int W100_SetGraphicWindowOnOff( int val ) -+{ -+ return( AtiCore_SetGraphicWindowOnOff( val ) ); -+} ++ int setFrgColour( int val ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_SetFrgColour( ccolor( val ) ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static unsigned long ccolor( unsigned int rgb ) -+{ -+ unsigned char r = ( rgb & 0xff0000 ) >> 19; -+ unsigned char g = ( rgb & 0xff00 ) >> 10; -+ unsigned char b = ( rgb & 0xff ) >> 3; -+ return ( ( ( ( unsigned short )0x1f & r ) << 11 ) | -+ ( ( ( unsigned short )0x3f & g ) << 5 ) | -+ ( ( ( unsigned short )0x1f & b ) ) ); -+} ++ int brushType( int type, unsigned int pattern ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_BrushType( type, &pattern ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_SetFrgColour( int val ) -+{ -+ return( AtiCore_SetFrgColour( ccolor( val ) ) ); -+} ++ int paintRect( int flags, ATI_RECT *rect ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_PaintRect( flags, rect ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_BrushType( int type, unsigned int pattern ) -+{ -+ return( AtiCore_BrushType( type, &pattern ) ); -+} ++ int polyline( int npoints, ATI_POINT *points ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_Polyline( npoints, points ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_PaintRect( int flags, ATI_RECT *rect ) -+{ -+ return( AtiCore_PaintRect( flags, rect ) ); -+} ++ int getPitchOffsetProperty( void *pitch, void *offset ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_GetPitchOffsetProperty( pitch, offset ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_Polyline( int npoints, ATI_POINT *points ) -+{ -+ return( AtiCore_Polyline( npoints, points ) ); -+} ++ int cursorOnOff( int a, int b ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_CursorOnOff( a, b ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_GetPitchOffsetProperty( void *pitch, void *offset ) -+{ -+ return( AtiCore_GetPitchOffsetProperty( pitch, offset ) ); -+} ++ int bitBlt( int flags, ATI_RECT *dst, ATI_RECT *src ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_BitBlt( flags, dst, src ) ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_CursorOnOff( int a, int b ) -+{ -+ return( AtiCore_CursorOnOff( a, b ) ); -+} ++ int wakeUpCall( void ) ++ { ++ if ( m_attached ) { ++ if ( AtiCore_WakeUpCall() ) { ++ return codOK; ++ } ++ } ++ return codError; ++ } + -+static int W100_BitBlt( int flags, ATI_RECT *dst, ATI_RECT *src ) -+{ -+ return( AtiCore_BitBlt( flags, dst, src ) ); -+} ++private: ++ FILE *m_logfile; ++ int m_loglevel; ++ bool m_logenabled; ++ bool m_attached; ++}; + -+static int W100_WakeUpCall( void ) -+{ -+ return( AtiCore_WakeUpCall() ); -+} ++W100Driver::Opcode W100Driver::lOpcodes[] = { ++ { "DRAWLINE", W100Driver::DRAWLINE, true, 0, 0 }, ++ { "DRAWPOINT", W100Driver::DRAWPOINT, true, 0, 0 }, ++ { "DRAWPOINTS", W100Driver::DRAWPOINTS, true, 0, 0 }, ++ { "FILLRECT", W100Driver::FILLRECT, true, 0, 0 }, ++ { "SCROLL", W100Driver::SCROLL, true, 0, 0 }, ++ { "BITBLT", W100Driver::BITBLT, true, 0, 0 }, ++ { "POLYLINE", W100Driver::POLYLINE, true, 0, 0 }, ++ { "" , W100Driver::EOO, false, 0, 0 } ++}; ++ ++W100Driver driver; + +class QW100Screen; +static QW100Screen *qt_w100_screen = 0; @@ -1128,6 +1336,9 @@ Manuel Teira <manuel.teira@telefonica.net> + QMap< uchar*, HWSurface > *getPSurfaceMap( void ) const; + void clearCache( int clientId ); + ++ // Suspend/resume hooks ++ virtual void prepareToSuspend(); ++ virtual void prepareToResume(); + // Rotation stuff + enum Transformation { None, Rot90, Rot180, Rot270 }; + void setTransformation( Transformation t ); @@ -1153,6 +1364,7 @@ Manuel Teira <manuel.teira@telefonica.net> + static void clearCache( QScreen *instance, int clientId ); + QMap< uchar*, HWSurface > surfaceMap; + int vramoffset; ++ bool m_isServer; + virtual int pixmapLinestepAlignment() { return 128; } +}; + @@ -1282,8 +1494,8 @@ Manuel Teira <manuel.teira@telefonica.net> + return FALSE; + } + sourcepixelpitch = ( this->srclinestep * 8 ) / this->srcdepth; -+ W100_SetSrcPitchOffset( sourcepixelpitch, -+ src_buffer_offset ); ++ driver.setSrcPitchOffset( sourcepixelpitch, ++ src_buffer_offset ); + } + return TRUE; +} @@ -1297,9 +1509,9 @@ Manuel Teira <manuel.teira@telefonica.net> + return FALSE; + } + int pixelstep = ( this->linestep() * 8 ) / depth; -+ W100_SetDstPitchOffset( pixelstep, buffer_offset ); ++ driver.setDstPitchOffset( pixelstep, buffer_offset ); + if ( setsrc ) { -+ W100_SetSrcPitchOffset( pixelstep, buffer_offset ); ++ driver.setSrcPitchOffset( pixelstep, buffer_offset ); + } + return TRUE; +} @@ -1325,8 +1537,8 @@ Manuel Teira <manuel.teira@telefonica.net> + return; + } + -+ if ( !control.accelerated( W100Control::DRAWLINE ) ) { -+ control.addMiss( W100Control::DRAWLINE ); ++ if ( !driver.accelerated( W100Driver::DRAWLINE ) ) { ++ driver.addMiss( W100Driver::DRAWLINE ); + QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); + return; + } @@ -1336,7 +1548,7 @@ Manuel Teira <manuel.teira@telefonica.net> + ( this->myrop != this->CopyROP ) || + ( this->cpen.width() > 1 ) || + ( this->dashedLines ) ) { -+ control.addMiss( W100Control::DRAWLINE ); ++ driver.addMiss( W100Driver::DRAWLINE ); + QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2); + return; + } @@ -1346,7 +1558,7 @@ Manuel Teira <manuel.teira@telefonica.net> + QWSDisplay::grab( true ); + if ( !checkDest() ) { + QWSDisplay::ungrab(); -+ control.addMiss( W100Control::DRAWLINE ); ++ driver.addMiss( W100Driver::DRAWLINE ); + QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); + return; + } @@ -1389,9 +1601,9 @@ Manuel Teira <manuel.teira@telefonica.net> + /* + * Just a dirty hack. Comment it out for now + if ( this->dashedLines ) { -+ W100_BrushType( 4, 0xaaaaaaaa ); ++ brushType( 4, 0xaaaaaaaa ); + } else { -+ W100_BrushType( 6, 0 ); ++ brushType( 6, 0 ); + } + switch( this->cpen.style() ) { + case Qt::NoPen: @@ -1417,15 +1629,15 @@ Manuel Teira <manuel.teira@telefonica.net> + } + */ + -+ //if ( control.lastOp() != W100Control::DRAWLINE && -+ //control.lastOp() != W100Control::POLYLINE ) { -+ W100_SetDstType( DSTTYPE_16BPP_1555 ); -+ W100_SetSrcType( SRCTYPE_EQU_DST ); -+ W100_SetRopOperation( ROP3_PATCOPY ); -+ W100_BrushType( 6, 0 ); ++ //if ( driver.lastOp() != W100Driver::DRAWLINE && ++ //driver.lastOp() != W100Driver::POLYLINE ) { ++ driver.setDstType( DSTTYPE_16BPP_1555 ); ++ driver.setSrcType( SRCTYPE_EQU_DST ); ++ driver.setRopOperation( ROP3_PATCOPY ); ++ driver.brushType( 6, 0 ); + //} -+ W100_SetFrgColour( this->cpen.color().rgb() ); -+ control.addHit( W100Control::DRAWLINE ); ++ driver.setFrgColour( this->cpen.color().rgb() ); ++ driver.addHit( W100Driver::DRAWLINE ); + + //The imageon seems not to write on the edge of the clip + //for the polyline op. @@ -1444,9 +1656,9 @@ Manuel Teira <manuel.teira@telefonica.net> + clip.Y_Top_Left = this->cliprect[loopc].y(); + clip.X_Bottom_Right = this->cliprect[loopc].right() + 1; + clip.Y_Bottom_Right = this->cliprect[loopc].bottom() + 1; -+ W100_SetDstClippingRect( &clip ); ++ driver.setDstClippingRect( &clip ); + -+ W100_Polyline( 3, points ); ++ driver.polyline( 3, points ); + } + + // Software mouse cursor stuff @@ -1488,15 +1700,15 @@ Manuel Teira <manuel.teira@telefonica.net> + return; + } + -+ if ( !control.accelerated( W100Control::POLYLINE ) ) { -+ control.addMiss( W100Control::POLYLINE ); ++ if ( !driver.accelerated( W100Driver::POLYLINE ) ) { ++ driver.addMiss( W100Driver::POLYLINE ); + QGfxRaster<depth,type>::drawPolyline( a, index, npoints ); + return; + } + + if ( this->cpen.style() != this->SolidLine || + this->myrop != this->CopyROP ) { -+ control.addMiss( W100Control::POLYLINE ); ++ driver.addMiss( W100Driver::POLYLINE ); + QGfxRaster<depth,type>::drawPolyline( a, index, npoints ); + return; + } @@ -1504,26 +1716,26 @@ Manuel Teira <manuel.teira@telefonica.net> + QWSDisplay::grab( TRUE ); + if ( !checkDest() ) { + QWSDisplay::ungrab(); -+ control.addMiss( W100Control::POLYLINE ); ++ driver.addMiss( W100Driver::POLYLINE ); + QGfxRaster<depth,type>::drawPolyline( a, index, npoints ); + return; + } + + ( *optype ) = 1; + -+ //if ( control.lastOp() != W100Control::POLYLINE && -+ //control.lastOp() != W100Control::DRAWLINE ) { ++ //if ( driver.lastOp() != W100Driver::POLYLINE && ++ //driver.lastOp() != W100Driver::DRAWLINE ) { + -+ W100_SetDstType( DSTTYPE_16BPP_1555 ); -+ W100_SetSrcType( SRCTYPE_EQU_DST ); -+ W100_SetRopOperation( ROP3_PATCOPY ); -+ W100_BrushType( 6, 0 ); ++ driver.setDstType( DSTTYPE_16BPP_1555 ); ++ driver.setSrcType( SRCTYPE_EQU_DST ); ++ driver.setRopOperation( ROP3_PATCOPY ); ++ driver.brushType( 6, 0 ); + + //} + -+ W100_SetFrgColour( this->cpen.color().rgb() ); ++ driver.setFrgColour( this->cpen.color().rgb() ); + -+ control.addHit( W100Control::POLYLINE ); ++ driver.addHit( W100Driver::POLYLINE ); + + ATI_POINT *points = new ATI_POINT[ npoints + 1 ]; + @@ -1536,16 +1748,16 @@ Manuel Teira <manuel.teira@telefonica.net> + + + GFX_START( clipbounds ); -+ W100_SetFrgColour( this->cpen.color().rgb() ); -+ W100_SetRopOperation( ROP3_PATCOPY ); ++ driver.setFrgColour( this->cpen.color().rgb() ); ++ driver.setRopOperation( ROP3_PATCOPY ); + for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) { + ATI_CLIPRECT clip; + clip.X_Top_Left = this->cliprect[loopc].x(); + clip.Y_Top_Left = this->cliprect[loopc].y(); + clip.X_Bottom_Right = this->cliprect[loopc].right() + 1; + clip.Y_Bottom_Right = this->cliprect[loopc].bottom() + 1; -+ W100_SetDstClippingRect( &clip ); -+ W100_Polyline( npoints + 1, points ); ++ driver.setDstClippingRect( &clip ); ++ driver.polyline( npoints + 1, points ); + } + GFX_END; + @@ -1598,15 +1810,15 @@ Manuel Teira <manuel.teira@telefonica.net> + return; + } + -+ if ( !control.accelerated( W100Control::DRAWPOINT) ) { -+ control.addMiss( W100Control::DRAWPOINT ); ++ if ( !driver.accelerated( W100Driver::DRAWPOINT) ) { ++ driver.addMiss( W100Driver::DRAWPOINT ); + QGfxRaster<depth,type>::drawPoint( x, y ); + return; + } + + if ( this->cpen.style() != this->SolidLine || + this->myrop != this->CopyROP ) { -+ control.addMiss( W100Control::DRAWPOINT ); ++ driver.addMiss( W100Driver::DRAWPOINT ); + QGfxRaster<depth,type>::drawPoint( x, y ); + return; + } @@ -1614,12 +1826,12 @@ Manuel Teira <manuel.teira@telefonica.net> + QWSDisplay::grab( TRUE ); + if ( !checkDest() ) { + QWSDisplay::ungrab(); -+ control.addMiss( W100Control::DRAWPOINT ); ++ driver.addMiss( W100Driver::DRAWPOINT ); + QGfxRaster<depth,type>::drawPoint( x, y ); + return; + } + -+ control.addHit( W100Control::DRAWPOINT ); ++ driver.addHit( W100Driver::DRAWPOINT ); + ( *optype ) = 1; + + ATI_POINT point; @@ -1627,16 +1839,16 @@ Manuel Teira <manuel.teira@telefonica.net> + point.YCoord = y + this->yoffs; + + GFX_START( clipbounds ); -+ W100_SetFrgColour( this->cpen.color().rgb() ); -+ W100_SetRopOperation( ROP3_PATCOPY ); ++ driver.setFrgColour( this->cpen.color().rgb() ); ++ driver.setRopOperation( ROP3_PATCOPY ); + for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) { + ATI_CLIPRECT clip; + clip.X_Top_Left = this->cliprect[loopc].x(); + clip.Y_Top_Left = this->cliprect[loopc].y(); + clip.X_Bottom_Right = this->cliprect[loopc].right() + 1; + clip.Y_Bottom_Right = this->cliprect[loopc].bottom() + 1; -+ W100_SetDstClippingRect( &clip ); -+ W100_DrawPixel( 1, &point ); ++ driver.setDstClippingRect( &clip ); ++ driver.drawPixel( 1, &point ); + } + GFX_END; + QWSDisplay::ungrab(); @@ -1667,15 +1879,15 @@ Manuel Teira <manuel.teira@telefonica.net> + return; + } + -+ if ( !control.accelerated( W100Control::DRAWPOINTS ) ) { -+ control.addMiss( W100Control::DRAWPOINTS ); ++ if ( !driver.accelerated( W100Driver::DRAWPOINTS ) ) { ++ driver.addMiss( W100Driver::DRAWPOINTS ); + QGfxRaster<depth,type>::drawPoints( a, index, npoints ); + return; + } + + if ( this->cpen.style() != this->SolidLine || + this->myrop != this->CopyROP ) { -+ control.addMiss( W100Control::DRAWPOINTS ); ++ driver.addMiss( W100Driver::DRAWPOINTS ); + QGfxRaster<depth,type>::drawPoints( a, index, npoints ); + return; + } @@ -1683,12 +1895,12 @@ Manuel Teira <manuel.teira@telefonica.net> + QWSDisplay::grab( TRUE ); + if ( !checkDest() ) { + QWSDisplay::ungrab(); -+ control.addMiss( W100Control::DRAWPOINTS ); ++ driver.addMiss( W100Driver::DRAWPOINTS ); + QGfxRaster<depth,type>::drawPoints( a, index, npoints ); + return; + } + -+ control.addHit( W100Control::DRAWPOINTS ); ++ driver.addHit( W100Driver::DRAWPOINTS ); + ( *optype ) = 1; + + ATI_POINT *points = new ATI_POINT[ npoints ]; @@ -1698,16 +1910,16 @@ Manuel Teira <manuel.teira@telefonica.net> + } + + GFX_START( clipbounds ); -+ W100_SetFrgColour( this->cpen.color().rgb() ); -+ W100_SetRopOperation( ROP3_PATCOPY ); ++ driver.setFrgColour( this->cpen.color().rgb() ); ++ driver.setRopOperation( ROP3_PATCOPY ); + for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) { + ATI_CLIPRECT clip; + clip.X_Top_Left = this->cliprect[loopc].x(); + clip.Y_Top_Left = this->cliprect[loopc].y(); + clip.X_Bottom_Right = this->cliprect[loopc].right() + 1; + clip.Y_Bottom_Right = this->cliprect[loopc].bottom() + 1; -+ W100_SetDstClippingRect( &clip ); -+ W100_DrawPixel( npoints, points ); ++ driver.setDstClippingRect( &clip ); ++ driver.drawPixel( npoints, points ); + } + GFX_END; + @@ -1740,8 +1952,8 @@ Manuel Teira <manuel.teira@telefonica.net> + int w, int h, + int sx, int sy ) +{ -+ if ( !control.accelerated( W100Control::SCROLL ) ) { -+ control.addMiss( W100Control::SCROLL ); ++ if ( !driver.accelerated( W100Driver::SCROLL ) ) { ++ driver.addMiss( W100Driver::SCROLL ); + QGfxRaster<depth,type>::scroll( rx, ry, w, h, sx, sy ); + return; + } @@ -1773,13 +1985,13 @@ Manuel Teira <manuel.teira@telefonica.net> + ( *optype ) = 1; + + -+ //if ( control.lastOp() != W100Control::SCROLL ) { -+ W100_SetRopOperation( ROP3_SRCCOPY ); -+ W100_SetDstType( DSTTYPE_16BPP_1555 ); -+ W100_SetSrcType( SRCTYPE_EQU_DST ); ++ //if ( driver.lastOp() != W100Driver::SCROLL ) { ++ driver.setRopOperation( ROP3_SRCCOPY ); ++ driver.setDstType( DSTTYPE_16BPP_1555 ); ++ driver.setSrcType( SRCTYPE_EQU_DST ); + //} + -+ control.addHit( W100Control::SCROLL ); ++ driver.addHit( W100Driver::SCROLL ); + + ATI_RECT srcrect, dstrect; + @@ -1791,7 +2003,7 @@ Manuel Teira <manuel.teira@telefonica.net> + dstrect.YCoord = ry; + dstrect.Width = w; + dstrect.Height = h; -+ control.log( W100Control::WARNING, ++ driver.log( W100Driver::WARNING, + "scroll [%d,%d,%d,%d] ->[%d,%d,%d,%d]", + sx, sy, w, h, rx, ry, w, h ); + for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) { @@ -1801,8 +2013,8 @@ Manuel Teira <manuel.teira@telefonica.net> + clip.X_Bottom_Right = this->cliprect[ loopc ].right() + 1; + clip.Y_Bottom_Right = this->cliprect[ loopc ].bottom() + 1; + -+ W100_SetDstClippingRect( &clip ); -+ W100_BitBlt( 1, &dstrect, &srcrect ); ++ driver.setDstClippingRect( &clip ); ++ driver.bitBlt( 1, &dstrect, &srcrect ); + } + GFX_END; + QWSDisplay::ungrab(); @@ -1810,7 +2022,7 @@ Manuel Teira <manuel.teira@telefonica.net> + } else { + QWSDisplay::ungrab(); + // software fallback -+ control.addMiss( W100Control::SCROLL ); ++ driver.addMiss( W100Driver::SCROLL ); + QGfxRaster<depth,type>::scroll( rx, ry, w, h, sx, sy ); + } +} @@ -1834,21 +2046,21 @@ Manuel Teira <manuel.teira@telefonica.net> +{ + if ( w <= 0 || h <= 0 || this->ncliprect < 1 ) return; + -+ if ( !control.accelerated( W100Control::FILLRECT ) ) { -+ control.addMiss( W100Control::FILLRECT ); ++ if ( !driver.accelerated( W100Driver::FILLRECT ) ) { ++ driver.addMiss( W100Driver::FILLRECT ); + QGfxRaster<depth,type>::fillRect( rx, ry, w, h ); + return; + } + + if ( ( this->cbrush.style() != this->NoBrush ) && + ( this->cbrush.style() != this->SolidPattern ) ) { -+ control.addMiss( W100Control::FILLRECT ); ++ driver.addMiss( W100Driver::FILLRECT ); + QGfxRaster<depth,type>::fillRect( rx, ry, w, h ); + return; + } + + if ( !checkDest() || ( this->myrop != this->CopyROP ) ) { -+ control.addMiss( W100Control::FILLRECT ); ++ driver.addMiss( W100Driver::FILLRECT ); + QGfxRaster<depth,type>::fillRect( rx, ry, w, h ); + return; + } @@ -1860,15 +2072,15 @@ Manuel Teira <manuel.teira@telefonica.net> + GFX_START( QRect( rx, ry, w + 1, h + 1 ) ); + + ( *optype ) = 1; -+ //if ( control.lastOp() != W100Control::FILLRECT ) { -+ W100_SetDstType( DSTTYPE_16BPP_1555 ); -+ W100_SetSrcType( SRCTYPE_EQU_DST ); -+ W100_SetRopOperation( ROP3_PATCOPY ); -+ W100_BrushType( 6, 0 ); ++ //if ( driver.lastOp() != W100Driver::FILLRECT ) { ++ driver.setDstType( DSTTYPE_16BPP_1555 ); ++ driver.setSrcType( SRCTYPE_EQU_DST ); ++ driver.setRopOperation( ROP3_PATCOPY ); ++ driver.brushType( 6, 0 ); + //} -+ W100_SetFrgColour( this->cbrush.color().rgb() ); ++ driver.setFrgColour( this->cbrush.color().rgb() ); + -+ control.addHit( W100Control::FILLRECT ); ++ driver.addHit( W100Driver::FILLRECT ); + + if ( this->cbrush.style() != this->NoBrush ) { + //Using all the cliprects @@ -1881,12 +2093,12 @@ Manuel Teira <manuel.teira@telefonica.net> + clip.X_Bottom_Right = this->cliprect[ loopc ].right() + 1; + clip.Y_Bottom_Right = this->cliprect[ loopc ].bottom() + 1; + -+ W100_SetDstClippingRect( &clip ); ++ driver.setDstClippingRect( &clip ); + rect.XCoord = rx; + rect.YCoord = ry; + rect.Width = w; + rect.Height = h; -+ W100_PaintRect( 1, &rect ); ++ driver.paintRect( 1, &rect ); + } + } + GFX_END; @@ -1940,8 +2152,8 @@ Manuel Teira <manuel.teira@telefonica.net> + return; + } + -+ if ( !control.accelerated( W100Control::BITBLT ) ) { -+ control.addMiss( W100Control::BITBLT ); ++ if ( !driver.accelerated( W100Driver::BITBLT ) ) { ++ driver.addMiss( W100Driver::BITBLT ); + QGfxRaster<depth,type>::blt( rx, ry, w, h, sx, sy ); + return; + } @@ -1951,13 +2163,13 @@ Manuel Teira <manuel.teira@telefonica.net> + this->alphatype == this->SeparateAlpha || + this->srctype == this->SourcePen || + ( this->myrop != this->CopyROP ) ) { -+ control.addMiss( W100Control::BITBLT ); ++ driver.addMiss( W100Driver::BITBLT ); + QGfxRaster<depth,type>::blt( rx, ry, w, h, sx, sy ); + return; + } + + if( ( this->srcdepth != 16 ) || this->alphatype != this->IgnoreAlpha ) { -+ control.addMiss( W100Control::BITBLT ); ++ driver.addMiss( W100Driver::BITBLT ); + QGfxRaster<depth,type>::blt( rx, ry, w, h, sx, sy ); + return; + } @@ -1969,13 +2181,13 @@ Manuel Teira <manuel.teira@telefonica.net> + w + 1, h + 1 ) ); + ( *optype ) = 1; + -+ //if ( control.lastOp() != W100Control::BITBLT ) { -+ W100_SetRopOperation( ROP3_SRCCOPY ); -+ W100_SetDstType( DSTTYPE_16BPP_1555 ); -+ W100_SetSrcType( SRCTYPE_EQU_DST ); ++ //if ( driver.lastOp() != W100Driver::BITBLT ) { ++ driver.setRopOperation( ROP3_SRCCOPY ); ++ driver.setDstType( DSTTYPE_16BPP_1555 ); ++ driver.setSrcType( SRCTYPE_EQU_DST ); + //} + -+ control.addHit( W100Control::BITBLT ); ++ driver.addHit( W100Driver::BITBLT ); + + ATI_RECT rect1; + ATI_RECT rect2; @@ -1997,8 +2209,8 @@ Manuel Teira <manuel.teira@telefonica.net> + clip.Y_Top_Left = this->cliprect[ loopc ].y(); + clip.X_Bottom_Right = this->cliprect[ loopc ].right() + 1; + clip.Y_Bottom_Right = this->cliprect[ loopc ].bottom() + 1; -+ W100_SetDstClippingRect( &clip ); -+ W100_BitBlt( 1, &rect2, &rect1 ); ++ driver.setDstClippingRect( &clip ); ++ driver.bitBlt( 1, &rect2, &rect1 ); + } + GFX_END; + @@ -2007,7 +2219,7 @@ Manuel Teira <manuel.teira@telefonica.net> + } else { + QWSDisplay::ungrab(); + // software fallback -+ control.addMiss( W100Control::BITBLT ); ++ driver.addMiss( W100Driver::BITBLT ); + QGfxRaster<depth,type>::blt( rx, ry, + w, h, sx, sy ); + } @@ -2077,7 +2289,7 @@ Manuel Teira <manuel.teira@telefonica.net> +template<const int depth,const int type> +void QGfxW100<depth,type>::sync() +{ -+ W100_WaitComplete( -1 ); ++ driver.waitComplete( -1 ); +} + +template <const int depth, const int type> @@ -2142,11 +2354,10 @@ Manuel Teira <manuel.teira@telefonica.net> + } +} + -+ -+ +QW100Screen::QW100Screen( int display_id ) + :QLinuxFbScreen( display_id ), -+ vramoffset( 0 ) ++ vramoffset( 0 ), ++ m_isServer( false ) +{ + qt_w100_screen = this; + vramoffset = 0; @@ -2190,14 +2401,14 @@ Manuel Teira <manuel.teira@telefonica.net> + +bool QW100Screen::connect( const QString &displaySpec ) +{ -+ control.log( W100Control::WARNING, "QW100Screen::connect('%s')", ++ driver.log( W100Driver::WARNING, "QW100Screen::connect('%s')", + displaySpec.latin1() ); + trans = getTransSpec( displaySpec ); + + if ( QLinuxFbScreen::connect( displaySpec ) ) { + vramoffset = ( w == 320 ) ? 0 : 0x0f000000; -+ if ( W100_ProcessAttach() ) { -+ W100_ProcessAttachSpecialMode( ( w == 480 ) ? 0xaaab : 0xaaaa ); ++ if ( driver.processAttach() == W100Driver::codOK ) { ++ driver.processAttachSpecialMode( ( w == 480 ) ? 0xaaab : 0xaaaa ); + surfaceMap.clear(); + surfaceMap.insert( 0, HWSurface( vramoffset, + data , false, @@ -2214,25 +2425,43 @@ Manuel Teira <manuel.teira@telefonica.net> + +void QW100Screen::disconnect( void ) +{ -+ control.log( W100Control::WARNING, "QW100Screen::disconnect()" ); -+ W100_ProcessDetach(); ++ driver.log( W100Driver::WARNING, "QW100Screen::disconnect()" ); ++ driver.processDetach(); + QLinuxFbScreen::disconnect(); + printf( "[%d]QW100Screen disconnected with %d surfaces\n", + getpid(), surfaceMap.count() ); + surfaceMap.clear(); +} + ++void QW100Screen::prepareToSuspend( void ) ++{ ++ driver.log( W100Driver::WARNING, ++ "QW100Screen::prepareToSuspend. Server = %s", ++ m_isServer ? "true" : "false" ); ++ driver.processDetach(); ++} ++ ++void QW100Screen::prepareToResume( void ) ++{ ++ driver.log( W100Driver::WARNING, ++ "QW100Screen::prepareToResume. Server = %s", ++ m_isServer ? "true": "false" ); ++ driver.processAttach(); ++ if ( m_isServer ) { ++ w100init(); ++ } ++} ++ +QW100Screen::~QW100Screen() +{ +} + +bool QW100Screen::w100init() +{ -+ control.log( W100Control::WARNING, ++ driver.log( W100Driver::WARNING, + "QW100Screen::w100init(%dx%d)", dw, dh ); + ATI_GRAPHICWINDOW win; + ATI_CLIPRECT clip; -+ int ret; + + win.dummy1 = 0; + win.Size.XCoord = 0; @@ -2243,30 +2472,29 @@ Manuel Teira <manuel.teira@telefonica.net> + win.Height = dw > dh ? dw : dh; + win.Flag = DSTTYPE_16BPP_444; + -+ ret = W100_SetupGraphicWindow( &win ); -+ if ( !ret ) { ++ if ( driver.setupGraphicWindow( &win ) != W100Driver::codOK ) { + return false; + } -+ ret = W100_SetGraphicWindowPos( 0, 0 ); ++ driver.setGraphicWindowPos( 0, 0 ); + -+ ret = W100_SetFrontBuffer( vramoffset, 0, 0 ); -+ ret = W100_SetDstPitchOffset( dw, vramoffset ); -+ ret = W100_SetDstType( DSTTYPE_16BPP_444 ); -+ ret = W100_SetSrcPitchOffset( dw, vramoffset ); -+ ret = W100_SetSrcType( SRCTYPE_SOLID_COLOR_BLT ); ++ driver.setFrontBuffer( vramoffset, 0, 0 ); ++ driver.setDstPitchOffset( dw, vramoffset ); ++ driver.setDstType( DSTTYPE_16BPP_444 ); ++ driver.setSrcPitchOffset( dw, vramoffset ); ++ driver.setSrcType( SRCTYPE_SOLID_COLOR_BLT ); + clip.X_Top_Left = 0; + clip.Y_Top_Left = 0; + clip.X_Bottom_Right = dw; + clip.Y_Bottom_Right = dh; -+ ret = W100_SetDstClippingRect( &clip ); ++ driver.setDstClippingRect( &clip ); + + clip.X_Top_Left = 0xE000; + clip.Y_Top_Left = 0xE000; + clip.X_Bottom_Right = 0x1FFF; + clip.Y_Bottom_Right = 0x1FFF; + -+ ret = W100_SetSrcClippingRect( &clip ); -+ ret = W100_SetGraphicWindowOnOff( 1 ); ++ driver.setSrcClippingRect( &clip ); ++ driver.setGraphicWindowOnOff( 1 ); + return true; +} + @@ -2276,8 +2504,9 @@ Manuel Teira <manuel.teira@telefonica.net> + +bool QW100Screen::initDevice() +{ -+ control.log( W100Control::WARNING, "initDevice( dw=%d, dh=%d )", ++ driver.log( W100Driver::WARNING, "initDevice( dw=%d, dh=%d )", + dw, dh ); ++ m_isServer = true; + + if ( !w100init() ) return false; + @@ -2293,19 +2522,20 @@ Manuel Teira <manuel.teira@telefonica.net> + +void QW100Screen::shutdownDevice() +{ -+ control.log( W100Control::WARNING, "Shutting down device" ); ++ driver.log( W100Driver::WARNING, "Shutting down device" ); + QLinuxFbScreen::shutdownDevice(); +} + +void QW100Screen::restore() +{ -+ control.log( W100Control::WARNING, "Restoring W100..." ); ++ driver.log( W100Driver::WARNING, "Restoring W100..." ); + /* -+ W100_WakeUpCall(); ++ wakeUpCall(); + initDevice(); -+ QLinuxFbScreen::restore(); ++ + */ -+ control.log( W100Control::WARNING, "Restoring done" ); ++ QLinuxFbScreen::restore(); ++ driver.log( W100Driver::WARNING, "Restoring done" ); +} + + @@ -2376,14 +2606,15 @@ Manuel Teira <manuel.teira@telefonica.net> +#else + int retcode = 0; + qt_fbdpy->grab( true ); -+ retcode = W100_AllocateSurface( &hSurface, -+ &surfaceOffset, -+ amount, 1 ); ++ retcode = driver.allocateSurface( &hSurface, ++ &surfaceOffset, ++ amount, 1 ); + qt_fbdpy->ungrab(); + if ( retcode ) { + internal = true; -+ W100_SetupMemoryTransfer( surfaceOffset, (uint32_t*) &localAddr ); -+ W100_TerminateMemoryTransfer(); ++ driver.setupMemoryTransfer( surfaceOffset, ++ (uint32_t*) &localAddr ); ++ driver.terminateMemoryTransfer(); + } else { + // Try to use the offscreen framebuffer memory + // to allocate the surface. Use the qgfxlinuxfb routines @@ -2408,10 +2639,10 @@ Manuel Teira <manuel.teira@telefonica.net> +{ + QMap< uchar*, HWSurface >::Iterator itr; + if ( ( itr = surfaceMap.find( c ) ) != surfaceMap.end() ) { -+ W100_WaitComplete( -1 ); ++ driver.waitComplete( -1 ); + if ( itr.data().internal() ) { + qt_fbdpy->grab( true ); -+ W100_DestroySurface( itr.data().getHandle() ); ++ driver.destroySurface( itr.data().getHandle() ); + qt_fbdpy->ungrab(); + } else { + QLinuxFbScreen::uncache( c ); @@ -2458,13 +2689,13 @@ Manuel Teira <manuel.teira@telefonica.net> +void QW100Screen::clearCache( int clientId ) +{ + printf( "[%d] CLEARING CACHE FOR %d\n", getpid(), clientId ); -+ control.log( W100Control::WARNING, "Cleaning cache for '%d'", clientId ); ++ driver.log( W100Driver::WARNING, "Cleaning cache for '%d'", clientId ); + QMap< uchar*, HWSurface >::Iterator itr = surfaceMap.begin(); + while ( itr != surfaceMap.end() ) { + if ( itr.data().getCId() == clientId ) { + if ( itr.data().internal() ) { + qt_fbdpy->grab(); -+ W100_DestroySurface( itr.data().getHandle() ); ++ driver.destroySurface( itr.data().getHandle() ); + qt_fbdpy->ungrab(); + } + surfaceMap.remove( itr ); diff --git a/packages/qte/qte-2.3.10/suspend-resume-hooks.patch b/packages/qte/qte-2.3.10/suspend-resume-hooks.patch new file mode 100644 index 0000000000..34e6ba2133 --- /dev/null +++ b/packages/qte/qte-2.3.10/suspend-resume-hooks.patch @@ -0,0 +1,64 @@ +Suspend/Resume hooks for QScreen and usage from QApplication +Manuel Teira <manuel.teira@telefonica.net> + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10/src/kernel/qgfx_qws.h~suspend-resume-hooks ++++ qt-2.3.10/src/kernel/qgfx_qws.h +@@ -192,6 +192,8 @@ + virtual int pixmapLinestepAlignment() { return 64; } + + virtual void sync() {} ++ virtual void prepareToSuspend() {} ++ virtual void prepareToResume() {} + virtual bool onCard(unsigned char *) const; + virtual bool onCard(unsigned char *, ulong& out_offset) const; + +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~suspend-resume-hooks ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp +@@ -480,6 +480,7 @@ + int region_offset_window; + #ifndef QT_NO_COP + QWSQCopMessageEvent *qcop_response; ++ bool manageAPMMessage( QWSQCopMessageEvent *e ); + #endif + QWSEvent* current_event; + QValueList<int> unused_identifiers; +@@ -840,7 +841,7 @@ + QWSQCopMessageEvent *pe = (QWSQCopMessageEvent*)e; + if ( pe->simpleData.is_response ) { + qcop_response = pe; +- } else { ++ } else if ( !manageAPMMessage( pe ) ) { + queue.append(e); + } + #endif +@@ -851,6 +852,26 @@ + } + } + ++#ifndef QT_NO_COP ++bool QWSDisplayData::manageAPMMessage( QWSQCopMessageEvent *e ) ++{ ++ if ( e->channel.data() != QCString( "QPE/System" ) ) { ++ return FALSE; ++ } ++ if ( e->message.data() == QCString( "aboutToSuspend()" ) ) { ++ if ( qt_screen ) qt_screen->prepareToSuspend(); ++ delete e; ++ return TRUE; ++ } ++ if ( e->message.data() == QCString( "returnFromSuspend()" ) ) { ++ if ( qt_screen ) qt_screen->prepareToResume(); ++ delete e; ++ return TRUE; ++ } ++ return FALSE; ++} ++#endif ++ + void QWSDisplayData::offsetPendingExpose( int window, const QPoint &offset ) + { + if ( offset.isNull() ) diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index ebcef630eb..8f6f5bfa3d 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -7,7 +7,7 @@ DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r21" +PR = "r22" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ @@ -34,21 +34,22 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://switches.h \ file://bidimetrics.patch;patch=5 " -SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://c7x0-w100-accel.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_beagle = "file://beagle.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " -SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_simpad = "file://devfs.patch;patch=1 " +SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ + file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " +SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_beagle = "file://beagle.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ + file://mnci.patch;patch=1 \ + file://mnci-touchscreen.patch;patch=1 \ + file://qkeyboard_qws.h \ + file://qkeyboard_qws.cpp " +SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " S = "${WORKDIR}/qt-${PV}" diff --git a/packages/regex-markup/regex-markup_0.9.0.bb b/packages/regex-markup/regex-markup_0.9.0.bb index 7b800eedb0..037ec57a38 100644 --- a/packages/regex-markup/regex-markup_0.9.0.bb +++ b/packages/regex-markup/regex-markup_0.9.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "unknown" DESCRIPTION = "Regex-markup performs regular expression-based text \ markup according to used-defined rules." diff --git a/packages/rhythmbox/rhythmbox_0.8.5.bb b/packages/rhythmbox/rhythmbox_0.8.5.bb index aa1ec636c0..b35914cccc 100644 --- a/packages/rhythmbox/rhythmbox_0.8.5.bb +++ b/packages/rhythmbox/rhythmbox_0.8.5.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "unknown" PR = "r3" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-${PV}.tar.gz \ diff --git a/packages/rhythmbox/rhythmbox_0.8.7.bb b/packages/rhythmbox/rhythmbox_0.8.7.bb index ada2fa6df1..2adb11fb8d 100644 --- a/packages/rhythmbox/rhythmbox_0.8.7.bb +++ b/packages/rhythmbox/rhythmbox_0.8.7.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "unknown" PR = "r0" diff --git a/packages/rsync/rsync_2.6.4.bb b/packages/rsync/rsync_2.6.4.bb index 5f1ce7d4d3..064e924789 100644 --- a/packages/rsync/rsync_2.6.4.bb +++ b/packages/rsync/rsync_2.6.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "A file-synchronization tool" SECTION = "console/network" PRIORITY = "optional" diff --git a/packages/sed/sed_4.0.8.bb b/packages/sed/sed_4.0.8.bb index 01ff61d107..eac4a9cec3 100644 --- a/packages/sed/sed_4.0.8.bb +++ b/packages/sed/sed_4.0.8.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "sed is a Stream EDitor." diff --git a/packages/sed/sed_4.0.9.bb b/packages/sed/sed_4.0.9.bb index 01ff61d107..eac4a9cec3 100644 --- a/packages/sed/sed_4.0.9.bb +++ b/packages/sed/sed_4.0.9.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "sed is a Stream EDitor." diff --git a/packages/sed/sed_4.1.1.bb b/packages/sed/sed_4.1.1.bb index 01ff61d107..eac4a9cec3 100644 --- a/packages/sed/sed_4.1.1.bb +++ b/packages/sed/sed_4.1.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "sed is a Stream EDitor." diff --git a/packages/sed/sed_4.1.2.bb b/packages/sed/sed_4.1.2.bb index 01ff61d107..eac4a9cec3 100644 --- a/packages/sed/sed_4.1.2.bb +++ b/packages/sed/sed_4.1.2.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "sed is a Stream EDitor." diff --git a/packages/sed/sed_4.1.bb b/packages/sed/sed_4.1.bb index 43116cb635..5f333d1513 100644 --- a/packages/sed/sed_4.1.bb +++ b/packages/sed/sed_4.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "sed is a Stream EDitor." diff --git a/packages/sgml-common/sgml-common_0.6.3.bb b/packages/sgml-common/sgml-common_0.6.3.bb index b2b8896b00..8b9fd5aeda 100644 --- a/packages/sgml-common/sgml-common_0.6.3.bb +++ b/packages/sgml-common/sgml-common_0.6.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "base" DESCRIPTION = "The sgml-common package gathers very basic \ stuff necessary to work with SGML and XML, such as xml.dcl, \ diff --git a/packages/sharp-binary-only/sharp-aticore-oss-1.0.1/fixstretchblit.patch b/packages/sharp-binary-only/sharp-aticore-oss-1.0.1/fixstretchblit.patch new file mode 100644 index 0000000000..a89ab3247a --- /dev/null +++ b/packages/sharp-binary-only/sharp-aticore-oss-1.0.1/fixstretchblit.patch @@ -0,0 +1,30 @@ +Index: AtiCore-1.0.1/aticore_2.s +=================================================================== +--- AtiCore-1.0.1.orig/aticore_2.s 2004-08-28 09:04:06.000000000 +0100 ++++ AtiCore-1.0.1/aticore_2.s 2005-07-04 21:56:48.000000000 +0100 +@@ -576,8 +576,6 @@ + LDR R3, [R11,#-0x2C] + STR R3, [R2,#0x24C] + B .loc_34DA00 +-unk_432B14: .WORD 0 +-unk_432B10: .WORD 0 + .loc_34D9F0: + MOV R2, #1 + LDR R1, =0x1284 +Index: AtiCore-1.0.1/aticore_0.s +=================================================================== +--- AtiCore-1.0.1.orig/aticore_0.s 2004-08-28 08:47:01.000000000 +0100 ++++ AtiCore-1.0.1/aticore_0.s 2005-07-04 22:28:55.000000000 +0100 +@@ -14,6 +14,12 @@ + .GLOBAL unk_41948C + unk_41948C: .WORD 0 + .ALIGN 4 ++ .GLOBAL unk_432B14 ++unk_432B14: .WORD 0 ++ .ALIGN 4 ++ .GLOBAL unk_432B10 ++unk_432B10: .WORD 0 ++ .ALIGN 4 + .GLOBAL aErrSomeoneCall + aErrSomeoneCall: .ASCII "Err:: someone called QL_Bar_Read!\000" + .ALIGN 4 diff --git a/packages/silo/silo_1.4.8.bb b/packages/silo/silo_1.4.8.bb index be137be2d9..ee107edeed 100644 --- a/packages/silo/silo_1.4.8.bb +++ b/packages/silo/silo_1.4.8.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "unknown" DEPENDS = "elftoaout-native" diff --git a/packages/slrn/slrn_0.9.8.0.bb b/packages/slrn/slrn_0.9.8.0.bb index f4fec68459..8adc26c76d 100644 --- a/packages/slrn/slrn_0.9.8.0.bb +++ b/packages/slrn/slrn_0.9.8.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "slrn - console news reader" SECTION = "console/network" PRIORITY = "optional" diff --git a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb index 76cc9dae9f..8d5bf1b283 100644 --- a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb +++ b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb @@ -1,4 +1,4 @@ -LICENSE = LGPL +LICENSE = "LGPL" SECTION = "console/multimedia" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" diff --git a/packages/strace/strace-4.5.12/quota.patch b/packages/strace/strace-4.5.12/quota.patch index 793bd4e96d..8d05da626a 100644 --- a/packages/strace/strace-4.5.12/quota.patch +++ b/packages/strace/strace-4.5.12/quota.patch @@ -1,10 +1,10 @@ ---- strace-4.5.12/resource.c.old 2005-06-28 14:05:33.000000000 +0100 -+++ strace-4.5.12/resource.c 2005-06-28 14:05:37.000000000 +0100 -@@ -36,7 +36,6 @@ +--- strace-4.5.11/resource.c.old 2005-06-28 14:44:27.000000000 +0100 ++++ strace-4.5.11/resource.c 2005-06-28 14:44:28.000000000 +0100 +@@ -36,6 +36,7 @@ #ifdef LINUX #include <sys/times.h> #include <linux/kernel.h> --#define _LINUX_QUOTA_VERSION 1 ++#define _LINUX_QUOTA_VERSION 1 #include <sys/quota.h> #endif /* LINUX */ #ifdef SUNOS4 diff --git a/packages/strace/strace_4.5.11.bb b/packages/strace/strace_4.5.11.bb index 8174a92e13..8570172782 100644 --- a/packages/strace/strace_4.5.11.bb +++ b/packages/strace/strace_4.5.11.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" PR = "r2" diff --git a/packages/strace/strace_4.5.12.bb b/packages/strace/strace_4.5.12.bb index a5cf1cf291..95a5b7fa9b 100644 --- a/packages/strace/strace_4.5.12.bb +++ b/packages/strace/strace_4.5.12.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/utils" PR = "r0" diff --git a/packages/sysfsutils/sysfsutils_1.3.0.bb b/packages/sysfsutils/sysfsutils_1.3.0.bb new file mode 100644 index 0000000000..82af8d353d --- /dev/null +++ b/packages/sysfsutils/sysfsutils_1.3.0.bb @@ -0,0 +1,21 @@ +SECTION = "base" +DESCRIPTION = "System Utilities Based on Sysfs" +HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" +LICENSE = "GPLv2" +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" + +S = "${WORKDIR}/sysfsutils-${PV}" + +inherit autotools + +includedir += "/sysfs" + +PACKAGES_prepend = "libsysfs " +FILES_libsysfs = "${libdir}/*.so.1.0.3" + +do_stage () { + oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/sysfs + install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs + install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs +} diff --git a/packages/sysklogd/sysklogd_1.4.1.bb b/packages/sysklogd/sysklogd_1.4.1.bb index 88d619a556..da05c0e02e 100644 --- a/packages/sysklogd/sysklogd_1.4.1.bb +++ b/packages/sysklogd/sysklogd_1.4.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "base" DESCRIPTION = "The sysklogd package implements \ two system log daemons." diff --git a/packages/tmdns/tmdns_20030116.bb b/packages/tmdns/tmdns_20030116.bb index 9907a52285..70607beee5 100644 --- a/packages/tmdns/tmdns_20030116.bb +++ b/packages/tmdns/tmdns_20030116.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "console/network" DESCRIPTION = "tmdns is a multicast DNS server." diff --git a/packages/usound/usound_0.2.0.bb b/packages/usound/usound_0.2.0.bb index 67c84538cb..659cdd85ef 100644 --- a/packages/usound/usound_0.2.0.bb +++ b/packages/usound/usound_0.2.0.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "The Useful Sound Daemon" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/vorbis-tools/vorbis-tools_1.0.1.bb b/packages/vorbis-tools/vorbis-tools_1.0.1.bb index e3fbc764ca..14f10afa5f 100644 --- a/packages/vorbis-tools/vorbis-tools_1.0.1.bb +++ b/packages/vorbis-tools/vorbis-tools_1.0.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DEPENDS = "libogg libvorbis libao curl" DESCRIPTION = " vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \ ogginfo (displays ogg information), vcut (ogg file splitter), and \ diff --git a/packages/wiggle/wiggle_0.6.bb b/packages/wiggle/wiggle_0.6.bb index ad45963c4c..e9c02a373d 100644 --- a/packages/wiggle/wiggle_0.6.bb +++ b/packages/wiggle/wiggle_0.6.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Wiggle is a program for applying patches that patch cannot \ apply because of conflicting changes." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" diff --git a/packages/xawtv/xawtv_3.93.bb b/packages/xawtv/xawtv_3.93.bb index a90a2ad29d..e22851c994 100644 --- a/packages/xawtv/xawtv_3.93.bb +++ b/packages/xawtv/xawtv_3.93.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11/utils" DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \ driver or video4linux. It also contains various command-line utilities for \ diff --git a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb index a35136bb40..ac03be504c 100644 --- a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +++ b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Transparent xcursor theme for handheld systems" SECTION = "x11/base" diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb index 46cfae1a0a..01f0678b12 100644 --- a/packages/xmonobut/xmonobut_0.4.bb +++ b/packages/xmonobut/xmonobut_0.4.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb index ebed8fd0da..842bad006a 100644 --- a/packages/xstroke/xstroke_0.6.bb +++ b/packages/xstroke/xstroke_0.6.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" SECTION = "x11" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb index 5c406087cf..f745ed82c0 100644 --- a/packages/xtscal/xtscal_0.6.3.bb +++ b/packages/xtscal/xtscal_0.6.3.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" DESCRIPTION = "Touchscreen calibration utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb index b46edc4820..29119dfe8e 100644 --- a/packages/xtst/xtst_cvs.bb +++ b/packages/xtst/xtst_cvs.bb @@ -1,4 +1,4 @@ -LICENSE = GPL +LICENSE = "GPL" PV = "0.0cvs${CVSDATE}" SECTION = "x11/libs" PRIORITY = "optional" |