diff options
Diffstat (limited to 'meta-oe')
27 files changed, 230 insertions, 114 deletions
diff --git a/meta-oe/classes/blacklist.bbclass b/meta-oe/classes/blacklist.bbclass deleted file mode 100644 index 7bf4a73a9a..0000000000 --- a/meta-oe/classes/blacklist.bbclass +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | # anonymous support class from angstrom | ||
| 2 | # | ||
| 3 | # Features: | ||
| 4 | # | ||
| 5 | # * blacklist handling, set ANGSTROM_BLACKLIST_pn-blah = "message" | ||
| 6 | # | ||
| 7 | |||
| 8 | python () { | ||
| 9 | import bb | ||
| 10 | |||
| 11 | blacklist = bb.data.getVar("ANGSTROM_BLACKLIST", d, 1) | ||
| 12 | pkgnm = bb.data.getVar("PN", d, 1) | ||
| 13 | distro = bb.data.getVar("DISTRO", d, 1) | ||
| 14 | |||
| 15 | if blacklist: | ||
| 16 | bb.note("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist)) | ||
| 17 | raise bb.parse.SkipPackage("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist)) | ||
| 18 | |||
| 19 | } | ||
| 20 | |||
diff --git a/meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb b/meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb index 1ce5912dc5..f4a65f0ab2 100644 --- a/meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb +++ b/meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb | |||
| @@ -7,7 +7,9 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html" | |||
| 7 | SECTION = "devel/libs" | 7 | SECTION = "devel/libs" |
| 8 | LICENSE = "GPLv2+" | 8 | LICENSE = "GPLv2+" |
| 9 | 9 | ||
| 10 | LIC_FILES_CHKSUM = "file://Makefile.in;endline=13;md5=a44bb8f4c22793d55c5e879eec256702" | 10 | PR = "r1" |
| 11 | |||
| 12 | LIC_FILES_CHKSUM = "file://src/libnfnetlink.c;beginline=3;endline=11;md5=28bd3bf7f60a78101491eef6b9bb9eba" | ||
| 11 | 13 | ||
| 12 | SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=libnfnetlink-${PV}" | 14 | SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=libnfnetlink-${PV}" |
| 13 | SRC_URI[libnfnetlink-1.0.0.md5sum] = "016fdec8389242615024c529acc1adb8" | 15 | SRC_URI[libnfnetlink-1.0.0.md5sum] = "016fdec8389242615024c529acc1adb8" |
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb index 6604091fe3..c86415374e 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require glibmm.inc | 1 | require glibmm.inc |
| 2 | 2 | ||
| 3 | PR = "r2" | 3 | PR = "r3" |
| 4 | 4 | ||
| 5 | SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3" | 5 | SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3" |
| 6 | SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192" | 6 | SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192" |
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb index 228f96c4ff..a6044cdf37 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require libgee.inc | 1 | require libgee.inc |
| 2 | PE = "1" | 2 | PE = "1" |
| 3 | PR = "${INC_PR}.1" | 3 | PR = "${INC_PR}.2" |
| 4 | DEPENDS += "gobject-introspection-stub" | 4 | DEPENDS += "gobject-introspection-stub" |
| 5 | DEPENDS_virtclass-native += "gobject-introspection-stub-native" | 5 | DEPENDS_virtclass-native += "gobject-introspection-stub-native" |
| 6 | 6 | ||
diff --git a/meta-oe/recipes-devtools/vala/vala_0.16.0.bb b/meta-oe/recipes-devtools/vala/vala_0.16.0.bb index 1dd190f01e..92120b4a36 100644 --- a/meta-oe/recipes-devtools/vala/vala_0.16.0.bb +++ b/meta-oe/recipes-devtools/vala/vala_0.16.0.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
| 2 | 2 | ||
| 3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.1" |
| 4 | 4 | ||
| 5 | SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" | 5 | SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" |
| 6 | 6 | ||
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb index 67cb32584d..a80447f4c1 100644 --- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb | |||
| @@ -4,7 +4,7 @@ DEPENDS = "t1lib gtk+ popt libxslt libxml2" | |||
| 4 | LICENSE = "LGPLv3" | 4 | LICENSE = "LGPLv3" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" |
| 6 | 6 | ||
| 7 | PR = "r2" | 7 | PR = "r3" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \ | 9 | SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \ |
| 10 | file://mathview-gcc43x.diff \ | 10 | file://mathview-gcc43x.diff \ |
diff --git a/meta-oe/recipes-extended/zram/zram/init b/meta-oe/recipes-extended/zram/zram/init new file mode 100644 index 0000000000..d12616936c --- /dev/null +++ b/meta-oe/recipes-extended/zram/zram/init | |||
| @@ -0,0 +1,85 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | ### BEGIN INIT INFO | ||
| 3 | # Provides: zram | ||
| 4 | # Required-Start: | ||
| 5 | # Required-Stop: | ||
| 6 | # Default-Start: 2 3 4 5 | ||
| 7 | # Default-Stop: 0 1 6 | ||
| 8 | # Short-Description: Increased Performance In Linux With zRam (Virtual Swap Compressed in RAM) | ||
| 9 | # Description: Adapted from systemd scripts at https://github.com/mystilleef/FedoraZram | ||
| 10 | # Included as part of antix-goodies package by anticapitalista <antiX@operamail.com> | ||
| 11 | # This script was written by tradetaxfree and is found at http://crunchbanglinux.org/forums/topic/15344/zram-a-good-idea/ | ||
| 12 | # Copy this script (as root) from /usr/local/bin to /etc/init.d and then #update-rc.d zram defaults | ||
| 13 | # After booting verify the module is loaded with: lsmod | grep zram | ||
| 14 | ### END INIT INFO | ||
| 15 | set -e | ||
| 16 | |||
| 17 | start() { | ||
| 18 | # get the number of CPUs | ||
| 19 | num_cpus=$(grep -c processor /proc/cpuinfo) | ||
| 20 | # if something goes wrong, assume we have 1 | ||
| 21 | [ "$num_cpus" != 0 ] || num_cpus=1 | ||
| 22 | |||
| 23 | # set decremented number of CPUs | ||
| 24 | last_cpu=$((num_cpus - 1)) | ||
| 25 | |||
| 26 | #default Factor % = 90 change this value here or create /etc/default/zram | ||
| 27 | FACTOR=90 | ||
| 28 | #& put the above single line in /etc/default/zram with the value you want | ||
| 29 | [ -f /etc/default/zram ] && source /etc/default/zram || true | ||
| 30 | factor=$FACTOR # percentage | ||
| 31 | |||
| 32 | # get the amount of memory in the machine | ||
| 33 | memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ') | ||
| 34 | mem_by_cpu=$(($memtotal/$num_cpus*$factor/100*1024)) | ||
| 35 | |||
| 36 | # load dependency modules | ||
| 37 | modprobe zram zram_num_devices=$num_cpus | ||
| 38 | echo "zram devices probed successfully" | ||
| 39 | |||
| 40 | # initialize the devices | ||
| 41 | for i in $(seq 0 $last_cpu); do | ||
| 42 | echo 1 > /sys/block/zram$i/reset | ||
| 43 | echo $mem_by_cpu > /sys/block/zram$i/disksize | ||
| 44 | # Creating swap filesystems | ||
| 45 | mkswap /dev/zram$i | ||
| 46 | # Switch the swaps on | ||
| 47 | swapon -p 100 /dev/zram$i | ||
| 48 | done | ||
| 49 | } | ||
| 50 | |||
| 51 | stop() { | ||
| 52 | # get the number of CPUs | ||
| 53 | num_cpus=$(grep -c processor /proc/cpuinfo) | ||
| 54 | |||
| 55 | # set decremented number of CPUs | ||
| 56 | last_cpu=$((num_cpus - 1)) | ||
| 57 | |||
| 58 | # Switching off swap | ||
| 59 | for i in $(seq 0 $last_cpu); do | ||
| 60 | if [ "$(grep /dev/zram$i /proc/swaps)" != "" ]; then | ||
| 61 | swapoff /dev/zram$i | ||
| 62 | sleep 1 | ||
| 63 | fi | ||
| 64 | done | ||
| 65 | sleep 1 | ||
| 66 | rmmod zram | ||
| 67 | } | ||
| 68 | |||
| 69 | case "$1" in | ||
| 70 | start) | ||
| 71 | start | ||
| 72 | ;; | ||
| 73 | stop) | ||
| 74 | stop | ||
| 75 | ;; | ||
| 76 | restart) | ||
| 77 | stop | ||
| 78 | sleep 3 | ||
| 79 | start | ||
| 80 | ;; | ||
| 81 | *) | ||
| 82 | echo "Usage: $0 {start|stop|restart}" | ||
| 83 | RETVAL=1 | ||
| 84 | esac | ||
| 85 | exit $RETVAL | ||
diff --git a/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-oe/recipes-extended/zram/zram_0.1.bb new file mode 100644 index 0000000000..85262647c0 --- /dev/null +++ b/meta-oe/recipes-extended/zram/zram_0.1.bb | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | DESCRIPTION = "Linux zram compressed in-memory swap" | ||
| 2 | LICENSE = "MIT" | ||
| 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | ||
| 4 | |||
| 5 | inherit allarch update-rc.d | ||
| 6 | |||
| 7 | RDEPENDS_${PN} = "util-linux-swaponoff kmod kernel-module-zram" | ||
| 8 | |||
| 9 | PR = "r0" | ||
| 10 | |||
| 11 | SRC_URI = " \ | ||
| 12 | file://init \ | ||
| 13 | " | ||
| 14 | |||
| 15 | do_install () { | ||
| 16 | # Sysvinit | ||
| 17 | install -d ${D}${sysconfdir}/init.d | ||
| 18 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram | ||
| 19 | } | ||
| 20 | |||
| 21 | FILES_${PN} = "${sysconfdir}/init.d" | ||
| 22 | INITSCRIPT_NAME = "zram" | ||
| 23 | INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." | ||
diff --git a/meta-oe/recipes-extended/zsh/zsh_4.3.17.bb b/meta-oe/recipes-extended/zsh/zsh.inc index 9192f20831..cacce9140c 100644 --- a/meta-oe/recipes-extended/zsh/zsh_4.3.17.bb +++ b/meta-oe/recipes-extended/zsh/zsh.inc | |||
| @@ -2,50 +2,54 @@ DESCRIPTION = "UNIX Shell similar to the Korn shell" | |||
| 2 | HOMEPAGE="http://www.zsh.org" | 2 | HOMEPAGE="http://www.zsh.org" |
| 3 | SECTION = "base/shell" | 3 | SECTION = "base/shell" |
| 4 | 4 | ||
| 5 | PR = "r0" | ||
| 6 | |||
| 5 | LICENSE = "ZSH" | 7 | LICENSE = "ZSH" |
| 6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=ad234d4b46db63491c4a9789da4fb341" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=ad234d4b46db63491c4a9789da4fb341" |
| 7 | 9 | ||
| 8 | DEPENDS = "ncurses libcap libpcre gdbm groff-native" | 10 | DEPENDS = "ncurses bison-native" |
| 9 | 11 | ||
| 10 | SRC_URI = "ftp://ftp.zsh.org/pub/${P}.tar.bz2" | 12 | SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz" |
| 11 | SRC_URI[md5sum] = "8258967060b2654f30001a011946ac6a" | ||
| 12 | SRC_URI[sha256sum] = "054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704" | ||
| 13 | 13 | ||
| 14 | FILES_${PN}-dbg += "\ | 14 | inherit autotools gettext update-alternatives |
| 15 | ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ | ||
| 16 | ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ | ||
| 17 | ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ | ||
| 18 | " | ||
| 19 | |||
| 20 | inherit autotools | ||
| 21 | 15 | ||
| 22 | EXTRA_OECONF = " \ | 16 | EXTRA_OECONF = " \ |
| 23 | --bindir=${base_bindir} \ | 17 | --bindir=${base_bindir} \ |
| 24 | --enable-etcdir=${sysconfdir} \ | 18 | --enable-etcdir=${sysconfdir} \ |
| 25 | --enable-fndir=${datadir}/${PN}/${PV}/functions \ | 19 | --enable-fndir=${datadir}/${PN}/${PV}/functions \ |
| 26 | --enable-site-fndir=${datadir}/${PN}/site-functions \ | 20 | --enable-site-fndir=${datadir}/${PN}/site-functions \ |
| 27 | --enable-function-subdirs \ | ||
| 28 | --with-term-lib='ncursesw ncurses' \ | 21 | --with-term-lib='ncursesw ncurses' \ |
| 29 | --with-tcsetpgrp \ | 22 | --with-tcsetpgrp \ |
| 30 | --enable-pcre \ | ||
| 31 | --enable-cap \ | 23 | --enable-cap \ |
| 32 | --enable-multibyte \ | 24 | --enable-multibyte \ |
| 33 | --enable-gdbm \ | 25 | --disable-gdbm \ |
| 34 | --enable-dynamic \ | 26 | --disable-dynamic \ |
| 35 | zsh_cv_shared_environ=yes \ | 27 | zsh_cv_shared_environ=yes \ |
| 36 | " | 28 | " |
| 37 | 29 | ||
| 30 | ALTERNATIVE_${PN} = "sh" | ||
| 31 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | ||
| 32 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" | ||
| 33 | ALTERNATIVE_PRIORITY = "100" | ||
| 34 | |||
| 35 | export AUTOHEADER = "true" | ||
| 36 | |||
| 38 | do_configure () { | 37 | do_configure () { |
| 39 | oe_runconf | 38 | oe_runconf |
| 40 | } | 39 | } |
| 41 | 40 | ||
| 41 | do_install_append () { | ||
| 42 | rm -fr ${D}/usr/share | ||
| 43 | } | ||
| 44 | |||
| 42 | pkg_postinst_${PN} () { | 45 | pkg_postinst_${PN} () { |
| 43 | touch $D${sysconfdir}/shells | 46 | touch $D${sysconfdir}/shells |
| 44 | grep -q "bin/zsh" $D${sysconfdir}/shells || echo "/bin/zsh" >> $D${sysconfdir}/shells | 47 | grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells |
| 48 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells | ||
| 45 | } | 49 | } |
| 46 | 50 | ||
| 47 | pkg_postrm_${PN} () { | 51 | FILES_${PN}-dbg += "\ |
| 48 | if [ -e $D${sysconfdir}/shells ]; then | 52 | ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ |
| 49 | sed -i -e '/\/bin\/zsh/d' $D${sysconfdir}/shells | 53 | ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ |
| 50 | fi | 54 | ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ |
| 51 | } | 55 | " |
diff --git a/meta-oe/recipes-extended/zsh/zsh_5.0.0.bb b/meta-oe/recipes-extended/zsh/zsh_5.0.0.bb new file mode 100644 index 0000000000..3421d950cf --- /dev/null +++ b/meta-oe/recipes-extended/zsh/zsh_5.0.0.bb | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | require zsh.inc | ||
| 2 | DEPENDS = "ncurses libcap libpcre gdbm groff-native" | ||
| 3 | |||
| 4 | SRC_URI[md5sum] = "01df38e4aa34aa227462fdf2f6d4c5cd" | ||
| 5 | SRC_URI[sha256sum] = "835194ea83abd812b5fdb1d2bfa6427c4c4e95e771c4a75e9006037af8efd264" | ||
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb index 69fa95f31d..05d71087d3 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require gtkmm.inc | 1 | require gtkmm.inc |
| 2 | 2 | ||
| 3 | PR = "${INC_PR}.1" | 3 | PR = "${INC_PR}.2" |
| 4 | 4 | ||
| 5 | SRC_URI[archive.md5sum] = "c0cb0ea5bc1ab511d9b2461083f0445f" | 5 | SRC_URI[archive.md5sum] = "c0cb0ea5bc1ab511d9b2461083f0445f" |
| 6 | SRC_URI[archive.sha256sum] = "c1199bbee423d6f0ef9b5e88973c5620a1e1c52f9f1298dffcfa36284a7fd91a" | 6 | SRC_URI[archive.sha256sum] = "c1199bbee423d6f0ef9b5e88973c5620a1e1c52f9f1298dffcfa36284a7fd91a" |
diff --git a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb b/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb index 6ae391f77f..86b4958cfb 100644 --- a/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb +++ b/meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require libsexy.inc | 1 | require libsexy.inc |
| 2 | 2 | ||
| 3 | PR = "r1" | 3 | PR = "r2" |
| 4 | 4 | ||
| 5 | SRC_URI[md5sum] = "33c079a253270ec8bfb9508e4bb30754" | 5 | SRC_URI[md5sum] = "33c079a253270ec8bfb9508e4bb30754" |
| 6 | SRC_URI[sha256sum] = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e" | 6 | SRC_URI[sha256sum] = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e" |
diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb b/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb index 44dcbd3acb..2007e9c433 100644 --- a/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb +++ b/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb | |||
| @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1 & GPLv2" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ |
| 5 | file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" | 5 | file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" |
| 6 | 6 | ||
| 7 | PR = "r1" | 7 | PR = "r2" |
| 8 | 8 | ||
| 9 | DEPENDS = "mm-common cairomm glibmm" | 9 | DEPENDS = "mm-common cairomm glibmm" |
| 10 | 10 | ||
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb index 1350751879..a8df317e9a 100644 --- a/meta-oe/recipes-navigation/navit/navit_svn.bb +++ b/meta-oe/recipes-navigation/navit/navit_svn.bb | |||
| @@ -2,7 +2,7 @@ require navit.inc | |||
| 2 | 2 | ||
| 3 | SRCREV = "5159" | 3 | SRCREV = "5159" |
| 4 | PV = "0.2.0+svnr${SRCPV}" | 4 | PV = "0.2.0+svnr${SRCPV}" |
| 5 | PR = "${INC_PR}.2" | 5 | PR = "${INC_PR}.3" |
| 6 | 6 | ||
| 7 | S = "${WORKDIR}/${PN}" | 7 | S = "${WORKDIR}/${PN}" |
| 8 | SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \ | 8 | SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \ |
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb index 118543bd96..338ff8cc3a 100644 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb +++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb | |||
| @@ -4,6 +4,8 @@ DEPENDS = "claws-mail gtkhtml2 curl" | |||
| 4 | LICENSE = "GPLv3" | 4 | LICENSE = "GPLv3" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94" |
| 6 | 6 | ||
| 7 | PR = "r1" | ||
| 8 | |||
| 7 | SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz" | 9 | SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz" |
| 8 | SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167" | 10 | SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167" |
| 9 | SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5" | 11 | SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5" |
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb index 8cb7fd0abf..119892f9e3 100644 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb +++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb | |||
| @@ -4,6 +4,8 @@ DEPENDS = "claws-mail" | |||
| 4 | LICENSE = "GPLv3" | 4 | LICENSE = "GPLv3" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 6 | 6 | ||
| 7 | PR = "r1" | ||
| 8 | |||
| 7 | SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\ | 9 | SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\ |
| 8 | file://claws-plugin-mailmbox-fixup.patch" | 10 | file://claws-plugin-mailmbox-fixup.patch" |
| 9 | SRC_URI[md5sum] = "0a5907628c1112cf8e5fe251ed1db551" | 11 | SRC_URI[md5sum] = "0a5907628c1112cf8e5fe251ed1db551" |
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb index 767c6722c3..b25f345776 100644 --- a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb +++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb | |||
| @@ -4,6 +4,8 @@ DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+" | |||
| 4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e" |
| 6 | 6 | ||
| 7 | PR = "r1" | ||
| 8 | |||
| 7 | SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz" | 9 | SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz" |
| 8 | SRC_URI[md5sum] = "7dfd8ae53cf1ed88d5e4150f77b9df63" | 10 | SRC_URI[md5sum] = "7dfd8ae53cf1ed88d5e4150f77b9df63" |
| 9 | SRC_URI[sha256sum] = "b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752" | 11 | SRC_URI[sha256sum] = "b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752" |
diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb index d0da53251a..f42d0dae19 100644 --- a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +++ b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "GPLv2 & LGPLv2.1" | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \ |
| 6 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 6 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
| 7 | 7 | ||
| 8 | PR = "r1" | 8 | PR = "r2" |
| 9 | 9 | ||
| 10 | SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \ | 10 | SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \ |
| 11 | file://glib-2.32.patch \ | 11 | file://glib-2.32.patch \ |
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index 61761e8a71..b7a7b756a1 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc | |||
| @@ -8,7 +8,13 @@ DEPENDS += "qemu-native" | |||
| 8 | 8 | ||
| 9 | DEPENDS +=" liblockfile" | 9 | DEPENDS +=" liblockfile" |
| 10 | 10 | ||
| 11 | X11DEPENDS = "gtk+ libungif dbus" | 11 | X11DEPENDS = " \ |
| 12 | libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ | ||
| 13 | jpeg xz pixman libpng librsvg tiff libcroco \ | ||
| 14 | libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ | ||
| 15 | libxft libxpm libxrandr libxrender \ | ||
| 16 | gdk-pixbuf glib-2.0 gtk+ pango libxcb \ | ||
| 17 | " | ||
| 12 | 18 | ||
| 13 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " | 19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " |
| 14 | 20 | ||
| @@ -50,11 +56,24 @@ do_compile_prepend() { | |||
| 50 | if [ -e $treedir ];then | 56 | if [ -e $treedir ];then |
| 51 | rm -rf $treedir | 57 | rm -rf $treedir |
| 52 | fi | 58 | fi |
| 59 | |||
| 60 | mkdir -p $treedir/${base_libdir} | ||
| 61 | |||
| 62 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then | ||
| 63 | cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} | ||
| 64 | fi | ||
| 65 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then | ||
| 66 | cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} | ||
| 67 | fi | ||
| 68 | # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails | ||
| 69 | # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one | ||
| 70 | if [ ! -f $treedir/${base_libdir}/libc.so ]; then | ||
| 71 | ln -s libc.so.6 $treedir/${base_libdir}/libc.so | ||
| 72 | fi | ||
| 53 | 73 | ||
| 54 | # copy only as much stuff as we need | 74 | # copy only as much stuff as we need |
| 55 | # before: 5.5G ../../qemu-treedir/ | 75 | # before: 5.5G ../../qemu-treedir/ |
| 56 | # after: 86M ../../qemu-treedir/ | 76 | # after: 17M ../../qemu-treedir/ |
| 57 | mkdir -p $treedir/${base_libdir} | ||
| 58 | cp -pPR \ | 77 | cp -pPR \ |
| 59 | ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ | 78 | ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ |
| 60 | ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ | 79 | ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ |
| @@ -65,57 +84,50 @@ do_compile_prepend() { | |||
| 65 | ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ | 84 | ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ |
| 66 | ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ | 85 | ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ |
| 67 | ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ | 86 | ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ |
| 68 | ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ | ||
| 69 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ | 87 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ |
| 70 | ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ | ||
| 71 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ | 88 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ |
| 72 | 89 | ||
| 73 | cp -pPR \ | 90 | if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then |
| 74 | ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ | 91 | echo "X11 build enabled" |
| 75 | ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ | 92 | # copy only as much stuff as we need |
| 76 | ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ | 93 | # before: 5.5G ../../qemu-treedir/ |
| 77 | ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ | 94 | # after: 86M ../../qemu-treedir/ |
| 78 | ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ | 95 | cp -pPR \ |
| 79 | ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ | 96 | ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ |
| 80 | ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ | 97 | ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ |
| 81 | ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ | 98 | ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ |
| 82 | ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ | 99 | ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ |
| 83 | ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ | 100 | ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ |
| 84 | ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ | 101 | ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ |
| 85 | ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ | 102 | ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ |
| 86 | ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ | 103 | ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ |
| 87 | ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ | 104 | ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ |
| 88 | ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ | 105 | ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ |
| 89 | ${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \ | 106 | ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ |
| 90 | ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ | 107 | ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ |
| 91 | ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ | 108 | ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ |
| 92 | ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ | 109 | ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ |
| 93 | ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ | 110 | ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ |
| 94 | ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/ | 111 | ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ |
| 95 | 112 | ${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \ | |
| 96 | # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender | 113 | ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ |
| 97 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ | 114 | ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ |
| 98 | 115 | ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ | |
| 99 | # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 | 116 | ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ |
| 100 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ | 117 | ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ |
| 101 | 118 | ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/ | |
| 102 | # pango pangocairo pangoft2 | 119 | |
| 103 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ | 120 | # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender |
| 104 | 121 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ | |
| 105 | # xcb-render xcb-shm xcb | 122 | |
| 106 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ | 123 | # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 |
| 107 | 124 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ | |
| 108 | #cp -pPR ${STAGING_DIR_TARGET}/* $treedir | 125 | |
| 109 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then | 126 | # pango pangocairo pangoft2 |
| 110 | cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/lib | 127 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ |
| 111 | fi | 128 | |
| 112 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then | 129 | # xcb-render xcb-shm xcb |
| 113 | cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/lib | 130 | cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ |
| 114 | fi | ||
| 115 | # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails | ||
| 116 | # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one | ||
| 117 | if [ ! -f $treedir/${base_libdir}/libc.so ]; then | ||
| 118 | ln -s libc.so.6 $treedir/${base_libdir}/libc.so | ||
| 119 | fi | 131 | fi |
| 120 | } | 132 | } |
| 121 | 133 | ||
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb index 65cc3a3347..5ad5644880 100644 --- a/meta-oe/recipes-support/emacs/emacs_23.4.bb +++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require emacs.inc | 1 | require emacs.inc |
| 2 | 2 | ||
| 3 | PR = "r1" | 3 | PR = "r2" |
| 4 | 4 | ||
| 5 | SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ | 5 | SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ |
| 6 | file://use-qemu.patch \ | 6 | file://use-qemu.patch \ |
diff --git a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb index 91fe6928b6..fe94fc4b19 100644 --- a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb +++ b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb | |||
| @@ -5,7 +5,7 @@ SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz" | |||
| 5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPLv2.1" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" |
| 7 | 7 | ||
| 8 | PR = "r2" | 8 | PR = "r3" |
| 9 | 9 | ||
| 10 | DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" | 10 | DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" |
| 11 | 11 | ||
diff --git a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb index 2e93690764..1e42cad6e5 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb +++ b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ | |||
| 8 | file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ | 8 | file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ |
| 9 | " | 9 | " |
| 10 | 10 | ||
| 11 | PR = "r2" | 11 | PR = "r3" |
| 12 | 12 | ||
| 13 | DEPENDS = "glib-2.0 gstreamer" | 13 | DEPENDS = "glib-2.0 gstreamer" |
| 14 | 14 | ||
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb index b0af84b055..625a57e9c9 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b" | |||
| 5 | # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. | 5 | # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. |
| 6 | DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib" | 6 | DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib" |
| 7 | 7 | ||
| 8 | PR = "r2" | 8 | PR = "r3" |
| 9 | 9 | ||
| 10 | PATCHSET = "6" | 10 | PATCHSET = "6" |
| 11 | SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ |
diff --git a/meta-oe/recipes-support/lzma/lzma.inc b/meta-oe/recipes-support/lzma/lzma.inc index 971860038a..457d7f4938 100644 --- a/meta-oe/recipes-support/lzma/lzma.inc +++ b/meta-oe/recipes-support/lzma/lzma.inc | |||
| @@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress | |||
| 2 | HOMEPAGE = "http://www.7-zip.org/" | 2 | HOMEPAGE = "http://www.7-zip.org/" |
| 3 | LICENSE = "LGPL" | 3 | LICENSE = "LGPL" |
| 4 | LIC_FILES_CHKSUM = "file://lzma.txt;md5=20251cdc2e3793cceab11878d0aa11b1" | 4 | LIC_FILES_CHKSUM = "file://lzma.txt;md5=20251cdc2e3793cceab11878d0aa11b1" |
| 5 | INC_PR = "r6" | 5 | INC_PR = "r7" |
| 6 | 6 | ||
| 7 | SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2;subdir=${BPN}-${PV} \ | 7 | SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2;subdir=${BPN}-${PV} \ |
| 8 | file://001-large_files.patch \ | 8 | file://001-large_files.patch \ |
| @@ -14,10 +14,10 @@ SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV', | |||
| 14 | EXTRA_OEMAKE = "-f makefile.gcc" | 14 | EXTRA_OEMAKE = "-f makefile.gcc" |
| 15 | 15 | ||
| 16 | do_unpack_append() { | 16 | do_unpack_append() { |
| 17 | import oe.process | 17 | import subprocess |
| 18 | # Replace MS-DOS line-endings with Unix style line-endings | 18 | # Replace MS-DOS line-endings with Unix style line-endings |
| 19 | oe.process.run("find . -type f -print0 | xargs -0 sed 's/\r$//' -i", | 19 | subprocess.call("find . -type f -print0 | xargs -0 sed 's/\r$//' -i", |
| 20 | cwd=d.getVar("S", True)) | 20 | cwd=d.getVar("S", True), shell=True) |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | do_compile() { | 23 | do_compile() { |
| @@ -32,5 +32,4 @@ do_install() { | |||
| 32 | oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir} | 32 | oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir} |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | NATIVE_INSTALL_WORKS = "1" | ||
| 36 | BBCLASSEXTEND = "native" | 35 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb index 4e26c98ede..d229c15015 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | require pidgin.inc | 1 | require pidgin.inc |
| 2 | PR = "${INC_PR}.2" | 2 | PR = "${INC_PR}.3" |
| 3 | 3 | ||
| 4 | DEPENDS += "farsight2 libidn" | 4 | DEPENDS += "farsight2 libidn" |
| 5 | 5 | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_0.18.0.bb b/meta-oe/recipes-support/poppler/poppler_0.18.0.bb index 6f1a022b9f..1217d6ce26 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.18.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.18.0.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require poppler.inc | 1 | require poppler.inc |
| 2 | 2 | ||
| 3 | PR = "r3" | 3 | PR = "r4" |
| 4 | 4 | ||
| 5 | DEPENDS += "lcms" | 5 | DEPENDS += "lcms" |
| 6 | 6 | ||
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.31.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.31.bb index 5fa0765faa..8b0b76a6ee 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.31.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.31.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1cc481c050dc92e12db9c8145043d5dc" | |||
| 8 | PR = "r1" | 8 | PR = "r1" |
| 9 | 9 | ||
| 10 | SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" | 10 | SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" |
| 11 | RC_URI[md5sum] = "9431e1944cde829a24dedf027e1364b5" | 11 | SRC_URI[md5sum] = "9431e1944cde829a24dedf027e1364b5" |
| 12 | SRC_URI[sha256sum] = "d84b38b61f0ca3941eb1c48a5858f93d1d1b70a623e579f5ecce2440e18410a4" | 12 | SRC_URI[sha256sum] = "d84b38b61f0ca3941eb1c48a5858f93d1d1b70a623e579f5ecce2440e18410a4" |
| 13 | 13 | ||
| 14 | inherit autotools | 14 | inherit autotools |
