diff options
-rw-r--r-- | classes/kernel.bbclass | 4 | ||||
-rw-r--r-- | conf/distro/include/fso-autorev.inc | 1 | ||||
-rw-r--r-- | conf/distro/include/moko-autorev.inc | 1 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
-rw-r--r-- | packages/gnome/gnome-games_2.24.0.bb | 41 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-bitstream-vera_1.10.bb | 2 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-dejavu_2.23.bb | 2 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-gentium_1.02.bb | 2 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 2 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-liberation_0.2.bb | 2 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-sazanami_20040629.bb | 2 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf.inc | 2 |
12 files changed, 53 insertions, 10 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d0db4c70d2..266a89dd9a 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -29,6 +29,7 @@ inherit kernel-arch PACKAGES_DYNAMIC += "kernel-module-*" PACKAGES_DYNAMIC += "kernel-image-*" +PACKAGES_DYNAMIC += "kernel-firmware-*" export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" @@ -428,6 +429,9 @@ python populate_packages_prepend () { postinst = bb.data.getVar('pkg_postinst_modules', d, 1) postrm = bb.data.getVar('pkg_postrm_modules', d, 1) + + do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') + do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % bb.data.getVar("KERNEL_VERSION", d, 1)) import re, os diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index cec2797bd4..f7eb3f1960 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -2,7 +2,6 @@ SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-fso-sounds = "${AUTOREV}" SRCREV_pn-gsm0710muxd = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" -SRCREV_pn-illume = "${AUTOREV}" SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" SRCREV_pn-mickeydbus = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index b043b30c8c..0d1c745472 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -4,7 +4,6 @@ SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-diversity-daemon ?= "${AUTOREV}" SRCREV_pn-diversity-nav ?= "${AUTOREV}" SRCREV_pn-exposure ?= "${AUTOREV}" -SRCREV_pn-illume ?= "${AUTOREV}" SRCREV_pn-illume-theme-asu ?= "${AUTOREV}" SRCREV_pn-libgsmd ?= "${AUTOREV}" SRCREV_pn-libjana ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2dce2bc738..8c5b1d8686 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -194,7 +194,7 @@ SRCREV_pn-zhone ?= "be3d72c6e5f5c0733df7064a616f8e39c1c12f2b" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "35984" +EFL_SRCREV ?= "36204" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" diff --git a/packages/gnome/gnome-games_2.24.0.bb b/packages/gnome/gnome-games_2.24.0.bb new file mode 100644 index 0000000000..d849f4c0c5 --- /dev/null +++ b/packages/gnome/gnome-games_2.24.0.bb @@ -0,0 +1,41 @@ +LICENSE = "GPL" +DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop" + +inherit gnome distutils-base gconf + +EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \ + --with-libggz-libraries=${STAGING_LIBDIR} \ + --with-ggzmod-includes=${STAGING_INCDIR} \ + --with-ggzmod-libraries=${STAGING_LIBDIR} \ + --enable-scalable \ + " + +do_configure_prepend() { + for i in $(find ${S} -name "Makefile.am") ; do + sed -i -e s:help::g $i + done +} + +do_configure_append() { + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i + done +} + +FILES_${PN}-doc += " ${datadir}/gnome/help" +FILES_${PN}-dbg += " ${bindir}/.debug ${libdir}/gnome-games/.debug" + +FILES_${PN} += "/var/games \ + ${datadir}/applications \ + ${datadir}/g* \ + ${datadir}/ggz \ + ${datadir}/icons \ + ${datadir}/pixmaps \ + ${sysconfdir}" + +PACKAGES =+ "gnome-games-gnometris " +FILES_gnome-games-gnometris = "${bindir}/gnometris ${datadir}/pixmaps/gnometris ${datadir}/pixmaps/gnome-gtetris.png ${datadir}/applications/gnometris.desktop ${sysconfdir}/gconf/schemas/gnometris.schemas" + +PACKAGES =+ "gnome-games-gnomine" +FILES_gnome-games-gnomine = "${bindir}/gnomine ${datadir}/pixmaps/gnomine ${datadir}/pixmaps/gnome-gnomine.png ${datadir}/applications/gnomine.desktop ${sysconfdir}/gconf/schemas/gnomine.schemas" + diff --git a/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb index 2335010ada..a19d879d0f 100644 --- a/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb @@ -2,7 +2,7 @@ require ttf.inc DESCRIPTION = "The Bitstream Vera fonts - TTF Edition" LICENSE = "Bitstream Vera" -PR = "r5" +PR = "r6" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" diff --git a/packages/ttf-fonts/ttf-dejavu_2.23.bb b/packages/ttf-fonts/ttf-dejavu_2.23.bb index 20919e90df..c2d06c4d5e 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.23.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.23.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://dejavu.sourceforge.net/wiki/" LICENSE = "Bitstream Vera" RDEPENDS = "ttf-dejavu-common" RDEPENDS_ttf-dejavu-common = "" -PR = "1" +PR = "2" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ file://30-dejavu-aliases.conf" diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb index e6550a5e9a..873ba1638f 100644 --- a/packages/ttf-fonts/ttf-gentium_1.02.bb +++ b/packages/ttf-fonts/ttf-gentium_1.02.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Gentium fonts - TTF Version" HOMEPAGE = "http://scripts.sil.org/gentium" LICENSE = "SIL Open Font License" LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL" -PR = "r2" +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ file://OFL.gz" diff --git a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb index 6f651feeb9..0987af58ee 100644 --- a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +++ b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb @@ -3,7 +3,7 @@ require ttf.inc DESCRIPTION = "Hunky fonts - TTF Version" HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts" LICENSE = "LGPL" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb index 3b8310b357..95e33daff3 100644 --- a/packages/ttf-fonts/ttf-liberation_0.2.bb +++ b/packages/ttf-fonts/ttf-liberation_0.2.bb @@ -3,7 +3,7 @@ require ttf.inc DESCRIPTION = "Liberation fonts - TTF Version" HOMEPAGE = "https://www.redhat.com/promo/fonts/" LICENSE = "Liberation" -PR = "r2" +PR = "r3" SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz" S = "${WORKDIR}/liberation-fonts-${PV}" diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index 71b8f57c36..852966ac58 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://sourceforge.jp/projects/efont/" LICENSE = "${PN}" SRC_DISTRIBUTE_LICENSES += "${PN}" RPROVIDES = "virtual/japanese-font" -PR = "r3" +PR = "r4" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" diff --git a/packages/ttf-fonts/ttf.inc b/packages/ttf-fonts/ttf.inc index 78133f9eab..65e08a6bbd 100644 --- a/packages/ttf-fonts/ttf.inc +++ b/packages/ttf-fonts/ttf.inc @@ -4,7 +4,7 @@ RRECOMMENDS += "font-update-common" do_install() { install -d ${D}${datadir}/fonts/truetype/ - find ./ -name "*.ttf" -or -name "*.ttc" -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; + find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; } pkg_postinst_append() { |