diff options
author | Alexander Larsson <alexl@redhat.com> | 2016-02-04 18:49:58 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2016-02-04 20:37:13 +0100 |
commit | 658ac1800b0c88d26140f8f471962da9e0be7cc7 (patch) | |
tree | baf3c8197bfec8e8dce85899b1e2af8a17105e68 | |
parent | 00bbf0755c82e1bbda8d17da2b34472187671ed8 (diff) |
Update yocto to the latest 2.0 branch
24 files changed, 228 insertions, 454 deletions
diff --git a/meta-freedesktop/conf/distro/freedesktop.conf b/meta-freedesktop/conf/distro/freedesktop.conf index 317e3a4..3edb0ce 100644 --- a/meta-freedesktop/conf/distro/freedesktop.conf +++ b/meta-freedesktop/conf/distro/freedesktop.conf @@ -23,7 +23,7 @@ PREFERRED_VERSION_rpm-native = "4.11.2" RPMROOTFSDEPENDS_remove = "rpmresolve-native:do_populate_sysroot" RDEPENDS_python3-modules_remove = "python3-2to3" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" PREMIRRORS ?= "\ diff --git a/meta-freedesktop/recipes-core/glibc/glibc_2.21.bbappend b/meta-freedesktop/recipes-core/glibc/glibc_2.22.bbappend index 42981d4..42981d4 100644 --- a/meta-freedesktop/recipes-core/glibc/glibc_2.21.bbappend +++ b/meta-freedesktop/recipes-core/glibc/glibc_2.22.bbappend diff --git a/meta-freedesktop/recipes-core/images/freedesktop-contents-sdk.bb b/meta-freedesktop/recipes-core/images/freedesktop-contents-sdk.bb index d65fb59..392d7a4 100644 --- a/meta-freedesktop/recipes-core/images/freedesktop-contents-sdk.bb +++ b/meta-freedesktop/recipes-core/images/freedesktop-contents-sdk.bb @@ -12,7 +12,6 @@ IMAGE_FEATURES += "package-management" PACKAGE_INSTALL += "\ task-freedesktop-contents-platform \ task-freedesktop-contents-sdk \ - libltdl-dev \ libgcc-dev \ glibc-dev \ glibc-dbg \ diff --git a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb index 7d5f894..a6dc43b 100644 --- a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb +++ b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb @@ -26,7 +26,7 @@ RDEPENDS_${PN} += "\ gmp \ libgomp \ libatomic \ - libatomics-ops \ + libatomic-ops \ popt \ util-linux-libuuid \ libpcre \ @@ -865,25 +865,28 @@ RDEPENDS_${PN} += "\ glibc-binary-localedata-zh-sg \ glibc-binary-localedata-zh-tw \ glibc-binary-localedata-zu-za \ - iso-codes-locale-aa \ iso-codes-locale-af \ iso-codes-locale-am \ iso-codes-locale-ar \ + iso-codes-locale-as \ + iso-codes-locale-ast \ iso-codes-locale-az \ iso-codes-locale-be \ iso-codes-locale-bg \ iso-codes-locale-bn \ + iso-codes-locale-bn-in \ iso-codes-locale-br \ iso-codes-locale-bs \ iso-codes-locale-byn \ iso-codes-locale-ca \ + iso-codes-locale-crh \ iso-codes-locale-cs \ iso-codes-locale-cy \ iso-codes-locale-da \ iso-codes-locale-de \ - iso-codes-locale-dv \ iso-codes-locale-dz \ iso-codes-locale-el \ + iso-codes-locale-en \ iso-codes-locale-eo \ iso-codes-locale-es \ iso-codes-locale-et \ @@ -896,28 +899,24 @@ RDEPENDS_${PN} += "\ iso-codes-locale-gez \ iso-codes-locale-gl \ iso-codes-locale-gu \ - iso-codes-locale-gv \ iso-codes-locale-haw \ iso-codes-locale-he \ iso-codes-locale-hi \ iso-codes-locale-hr \ iso-codes-locale-hu \ iso-codes-locale-hy \ + iso-codes-locale-ia \ iso-codes-locale-id \ iso-codes-locale-is \ iso-codes-locale-it \ - iso-codes-locale-iu \ iso-codes-locale-ja \ iso-codes-locale-ka \ iso-codes-locale-kk \ - iso-codes-locale-kl \ iso-codes-locale-km \ iso-codes-locale-kn \ iso-codes-locale-ko \ iso-codes-locale-kok \ iso-codes-locale-ku \ - iso-codes-locale-kw \ - iso-codes-locale-ky \ iso-codes-locale-lt \ iso-codes-locale-lv \ iso-codes-locale-mi \ @@ -931,10 +930,9 @@ RDEPENDS_${PN} += "\ iso-codes-locale-ne \ iso-codes-locale-nl \ iso-codes-locale-nn \ - iso-codes-locale-no \ iso-codes-locale-nso \ iso-codes-locale-oc \ - iso-codes-locale-om \ + iso-codes-locale-or \ iso-codes-locale-pa \ iso-codes-locale-pl \ iso-codes-locale-ps \ @@ -943,16 +941,15 @@ RDEPENDS_${PN} += "\ iso-codes-locale-ro \ iso-codes-locale-ru \ iso-codes-locale-rw \ - iso-codes-locale-sa \ - iso-codes-locale-sid \ + iso-codes-locale-si \ iso-codes-locale-sk \ iso-codes-locale-sl \ iso-codes-locale-so \ iso-codes-locale-sq \ iso-codes-locale-sr \ + iso-codes-locale-sr+latin \ iso-codes-locale-sv \ iso-codes-locale-sw \ - iso-codes-locale-syr \ iso-codes-locale-ta \ iso-codes-locale-te \ iso-codes-locale-th \ @@ -962,9 +959,9 @@ RDEPENDS_${PN} += "\ iso-codes-locale-tl \ iso-codes-locale-tr \ iso-codes-locale-tt \ + iso-codes-locale-tt+iqtelif \ + iso-codes-locale-ug \ iso-codes-locale-uk \ - iso-codes-locale-ur \ - iso-codes-locale-uz \ iso-codes-locale-ve \ iso-codes-locale-vi \ iso-codes-locale-wa \ diff --git a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb index bf57e80..cc0c11b 100644 --- a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb +++ b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb @@ -90,13 +90,12 @@ RDEPENDS_${PN} += " \ libpcre-dev \ \ cracklib-dev \ - libcurl-dev \ curl-dev \ db-dev \ icu-dev \ krb5-dev \ - libacl-dev \ - libattr-dev \ + acl-dev \ + attr-dev \ libcap-bin \ libcap-dev \ libsqlite3-dev \ @@ -120,13 +119,10 @@ RDEPENDS_${PN} += " \ tiff-dev \ flac-dev \ speex-dev \ - speex-bin \ libsamplerate0-dev \ \ bzip2-dev \ libarchive-dev \ - libbz2-dev \ - liblzma-dev \ xz-dev \ zlib-dev \ \ @@ -149,11 +145,8 @@ RDEPENDS_${PN} += " \ iso-codes-dev \ json-c-dev \ lcms-dev \ - libasm-dev \ - libatomics-ops-dev \ - libdw-dev \ - libelf-dev \ - libgcov-dev \ + libatomic-ops-dev \ + libgcc-dev \ libxml2-dev \ libxml2-python \ libxslt-bin \ @@ -181,6 +174,9 @@ RDEPENDS_${PN} += " \ perl-module-autodie-exception \ perl-module-autodie-exception-system \ perl-module-autodie-hints \ + perl-module-autodie-scope-guard \ + perl-module-autodie-scope-guardstack \ + perl-module-autodie-scopeutil \ perl-module-autodie-skip \ perl-module-autoloader \ perl-module-autosplit \ @@ -195,20 +191,22 @@ RDEPENDS_${PN} += " \ perl-module-bignum \ perl-module-bigrat \ perl-module-blib \ + perl-module-b-op-private \ perl-module-b-showlex \ perl-module-b-terse \ - perl-module-build \ perl-module-b-xref \ perl-module-bytes \ + perl-module-bytes-heavy \ perl-module-carp \ perl-module-carp-heavy \ - perl-module-charnames \ perl-module--charnames \ + perl-module-charnames \ perl-module-class-struct \ perl-module-compress-raw-bzip2 \ perl-module-compress-raw-zlib \ perl-module-compress-zlib \ perl-module-config-extensions \ + perl-module-config-git \ perl-module-config-perl-v \ perl-module-constant \ perl-module-corelist \ @@ -233,14 +231,18 @@ RDEPENDS_${PN} += " \ perl-module-digest-md5 \ perl-module-digest-sha \ perl-module-dirhandle \ + perl-module-dumpvalue \ + perl-module-dumpvar \ perl-module-dynaloader \ perl-module-encode \ perl-module-encode-alias \ perl-module-encode-byte \ + perl-module-encode-changes \ perl-module-encode-cjkconstants \ perl-module-encode-cn \ perl-module-encode-cn-hz \ perl-module-encode-config \ + perl-module-encode-configlocal-pm \ perl-module-encode-ebcdic \ perl-module-encode-encoder \ perl-module-encode-encoding \ @@ -251,10 +253,14 @@ RDEPENDS_${PN} += " \ perl-module-encode-jp-jis7 \ perl-module-encode-kr \ perl-module-encode-kr-2022-kr \ + perl-module-encode-makefile-pl \ perl-module-encode-mime-header \ perl-module-encode-mime-header-iso-2022-jp \ perl-module-encode-mime-name \ + perl-module-encode--pm \ + perl-module-encode-readme \ perl-module-encode-symbol \ + perl-module-encode--t \ perl-module-encode-tw \ perl-module-encode-unicode \ perl-module-encode-unicode-utf7 \ @@ -266,6 +272,72 @@ RDEPENDS_${PN} += " \ perl-module-experimental \ perl-module-exporter \ perl-module-exporter-heavy \ + perl-module-extutils-cbuilder \ + perl-module-extutils-cbuilder-base \ + perl-module-extutils-cbuilder-platform-aix \ + perl-module-extutils-cbuilder-platform-android \ + perl-module-extutils-cbuilder-platform-cygwin \ + perl-module-extutils-cbuilder-platform-darwin \ + perl-module-extutils-cbuilder-platform-dec-osf \ + perl-module-extutils-cbuilder-platform-os2 \ + perl-module-extutils-cbuilder-platform-unix \ + perl-module-extutils-cbuilder-platform-vms \ + perl-module-extutils-cbuilder-platform-windows \ + perl-module-extutils-cbuilder-platform-windows-bcc \ + perl-module-extutils-cbuilder-platform-windows-gcc \ + perl-module-extutils-cbuilder-platform-windows-msvc \ + perl-module-extutils-command \ + perl-module-extutils-command-mm \ + perl-module-extutils-constant \ + perl-module-extutils-constant-base \ + perl-module-extutils-constant-proxysubs \ + perl-module-extutils-constant-utils \ + perl-module-extutils-constant-xs \ + perl-module-extutils-embed \ + perl-module-extutils-install \ + perl-module-extutils-installed \ + perl-module-extutils-liblist \ + perl-module-extutils-liblist-kid \ + perl-module-extutils-makemaker \ + perl-module-extutils-makemaker-config \ + perl-module-extutils-makemaker-locale \ + perl-module-extutils-makemaker-version \ + perl-module-extutils-makemaker-version-regex \ + perl-module-extutils-makemaker-version-vpp \ + perl-module-extutils-manifest \ + perl-module-extutils-miniperl \ + perl-module-extutils-mkbootstrap \ + perl-module-extutils-mksymlists \ + perl-module-extutils-mm \ + perl-module-extutils-mm-aix \ + perl-module-extutils-mm-any \ + perl-module-extutils-mm-beos \ + perl-module-extutils-mm-cygwin \ + perl-module-extutils-mm-darwin \ + perl-module-extutils-mm-dos \ + perl-module-extutils-mm-macos \ + perl-module-extutils-mm-nw5 \ + perl-module-extutils-mm-os2 \ + perl-module-extutils-mm-qnx \ + perl-module-extutils-mm-unix \ + perl-module-extutils-mm-uwin \ + perl-module-extutils-mm-vms \ + perl-module-extutils-mm-vos \ + perl-module-extutils-mm-win32 \ + perl-module-extutils-mm-win95 \ + perl-module-extutils-my \ + perl-module-extutils-packlist \ + perl-module-extutils-parsexs \ + perl-module-extutils-parsexs-constants \ + perl-module-extutils-parsexs-countlines \ + perl-module-extutils-parsexs-eval \ + perl-module-extutils-parsexs-utilities \ + perl-module-extutils-testlib \ + perl-module-extutils-typemaps \ + perl-module-extutils-typemaps-cmd \ + perl-module-extutils-typemaps-inputmap \ + perl-module-extutils-typemaps-outputmap \ + perl-module-extutils-typemaps-type \ perl-module-fatal \ perl-module-fcntl \ perl-module-feature \ @@ -292,6 +364,7 @@ RDEPENDS_${PN} += " \ perl-module-file-spec-win32 \ perl-module-file-stat \ perl-module-file-temp \ + perl-module-filetest \ perl-module-filter-simple \ perl-module-filter-util-call \ perl-module-findbin \ @@ -299,13 +372,14 @@ RDEPENDS_${PN} += " \ perl-module-getopt-std \ perl-module-hash-util \ perl-module-hash-util-fieldhash \ + perl-module-http-tiny \ perl-module-i18n-collate \ perl-module-i18n-langinfo \ perl-module-i18n-langtags \ perl-module-i18n-langtags-detect \ perl-module-i18n-langtags-list \ - perl-module-inc-latest \ - perl-module-inc-latest-private \ + perl-module-if \ + perl-module-integer \ perl-module-io \ perl-module-io-compress-adapter-bzip2 \ perl-module-io-compress-adapter-deflate \ @@ -405,11 +479,16 @@ RDEPENDS_${PN} += " \ perl-module-memoize-anydbm-file \ perl-module-memoize-expire \ perl-module-memoize-expirefile \ + perl-module-memoize-expiretest \ + perl-module-memoize-ndbm-file \ perl-module-memoize-sdbm-file \ perl-module-memoize-storable \ + perl-module-metadata \ + perl-module-meta-notation \ perl-module-mime-base64 \ perl-module-mime-quotedprint \ perl-module-mro \ + perl-module-ndbm-file \ perl-module-net-cmd \ perl-module-net-config \ perl-module-net-domain \ @@ -431,23 +510,31 @@ RDEPENDS_${PN} += " \ perl-module-net-time \ perl-module-next \ perl-module-o \ + perl-module-odbm-file \ + perl-module-ok \ perl-module-opcode \ perl-module-open \ perl-module-ops \ perl-module-overload \ perl-module-overloading \ - perl-module-package-constants \ + perl-module-overload-numbers \ perl-module-params-check \ perl-module-parent \ + perl-module-parse-cpan-meta \ + perl-module-perl5db \ + perl-module-perlfaq \ + perl-module-perlio \ perl-module-perlio-encoding \ perl-module-perlio-mmap \ perl-module-perlio-scalar \ perl-module-perlio-via \ perl-module-perlio-via-quotedprint \ + perl-module-perl-ostype \ perl-module-pod-checker \ perl-module-pod-escapes \ perl-module-pod-find \ perl-module-pod-functions \ + perl-module-pod-html \ perl-module-pod-inputobjects \ perl-module-pod-man \ perl-module-pod-parselink \ @@ -464,6 +551,7 @@ RDEPENDS_${PN} += " \ perl-module-pod-perldoc-tortf \ perl-module-pod-perldoc-toterm \ perl-module-pod-perldoc-totext \ + perl-module-pod-perldoc-totk \ perl-module-pod-perldoc-toxml \ perl-module-pod-plaintext \ perl-module-pod-select \ @@ -473,6 +561,9 @@ RDEPENDS_${PN} += " \ perl-module-pod-simple-debug \ perl-module-pod-simple-dumpastext \ perl-module-pod-simple-dumpasxml \ + perl-module-pod-simple-html \ + perl-module-pod-simple-htmlbatch \ + perl-module-pod-simple-htmllegacy \ perl-module-pod-simple-linksection \ perl-module-pod-simple-methody \ perl-module-pod-simple-progress \ @@ -490,6 +581,7 @@ RDEPENDS_${PN} += " \ perl-module-pod-simple-transcode \ perl-module-pod-simple-transcodedumb \ perl-module-pod-simple-transcodesmart \ + perl-module-pod-simple-xhtml \ perl-module-pod-simple-xmloutstream \ perl-module-pod-text \ perl-module-pod-text-color \ @@ -508,6 +600,8 @@ RDEPENDS_${PN} += " \ perl-module-socket \ perl-module-sort \ perl-module-storable \ + perl-module-subs \ + perl-module-sub-util \ perl-module-symbol \ perl-module-sys-hostname \ perl-module-sys-syslog \ @@ -560,12 +654,18 @@ RDEPENDS_${PN} += " \ perl-module-term-readline \ perl-module-test \ perl-module-test-builder \ + perl-module-test-builder-io-scalar \ perl-module-test-builder-module \ perl-module-test-builder-tester \ perl-module-test-builder-tester-color \ perl-module-test-harness \ perl-module-test-more \ perl-module-test-simple \ + perl-module-test-tester \ + perl-module-test-tester-capture \ + perl-module-test-tester-capturerunner \ + perl-module-test-tester-delegate \ + perl-module-test-use-ok \ perl-module-text-abbrev \ perl-module-text-balanced \ perl-module-text-parsewords \ @@ -602,6 +702,88 @@ RDEPENDS_${PN} += " \ perl-module-unicode-collate-cjk-stroke \ perl-module-unicode-collate-cjk-zhuyin \ perl-module-unicode-collate-locale \ + perl-module-unicode-collate-locale-af \ + perl-module-unicode-collate-locale-ar \ + perl-module-unicode-collate-locale-as \ + perl-module-unicode-collate-locale-az \ + perl-module-unicode-collate-locale-be \ + perl-module-unicode-collate-locale-bg \ + perl-module-unicode-collate-locale-bn \ + perl-module-unicode-collate-locale-ca \ + perl-module-unicode-collate-locale-cs \ + perl-module-unicode-collate-locale-cy \ + perl-module-unicode-collate-locale-da \ + perl-module-unicode-collate-locale-de-phone \ + perl-module-unicode-collate-locale-ee \ + perl-module-unicode-collate-locale-eo \ + perl-module-unicode-collate-locale-es \ + perl-module-unicode-collate-locale-es-trad \ + perl-module-unicode-collate-locale-et \ + perl-module-unicode-collate-locale-fa \ + perl-module-unicode-collate-locale-fi \ + perl-module-unicode-collate-locale-fil \ + perl-module-unicode-collate-locale-fi-phone \ + perl-module-unicode-collate-locale-fo \ + perl-module-unicode-collate-locale-fr \ + perl-module-unicode-collate-locale-gu \ + perl-module-unicode-collate-locale-ha \ + perl-module-unicode-collate-locale-haw \ + perl-module-unicode-collate-locale-hi \ + perl-module-unicode-collate-locale-hr \ + perl-module-unicode-collate-locale-hu \ + perl-module-unicode-collate-locale-hy \ + perl-module-unicode-collate-locale-ig \ + perl-module-unicode-collate-locale-is \ + perl-module-unicode-collate-locale-ja \ + perl-module-unicode-collate-locale-kk \ + perl-module-unicode-collate-locale-kl \ + perl-module-unicode-collate-locale-kn \ + perl-module-unicode-collate-locale-ko \ + perl-module-unicode-collate-locale-kok \ + perl-module-unicode-collate-locale-ln \ + perl-module-unicode-collate-locale-lt \ + perl-module-unicode-collate-locale-lv \ + perl-module-unicode-collate-locale-mk \ + perl-module-unicode-collate-locale-ml \ + perl-module-unicode-collate-locale-mr \ + perl-module-unicode-collate-locale-mt \ + perl-module-unicode-collate-locale-nb \ + perl-module-unicode-collate-locale-nn \ + perl-module-unicode-collate-locale-nso \ + perl-module-unicode-collate-locale-om \ + perl-module-unicode-collate-locale-or \ + perl-module-unicode-collate-locale-pa \ + perl-module-unicode-collate-locale-pl \ + perl-module-unicode-collate-locale-ro \ + perl-module-unicode-collate-locale-ru \ + perl-module-unicode-collate-locale-sa \ + perl-module-unicode-collate-locale-se \ + perl-module-unicode-collate-locale-si \ + perl-module-unicode-collate-locale-si-dict \ + perl-module-unicode-collate-locale-sk \ + perl-module-unicode-collate-locale-sl \ + perl-module-unicode-collate-locale-sq \ + perl-module-unicode-collate-locale-sr \ + perl-module-unicode-collate-locale-sv \ + perl-module-unicode-collate-locale-sv-refo \ + perl-module-unicode-collate-locale-ta \ + perl-module-unicode-collate-locale-te \ + perl-module-unicode-collate-locale-th \ + perl-module-unicode-collate-locale-tn \ + perl-module-unicode-collate-locale-to \ + perl-module-unicode-collate-locale-tr \ + perl-module-unicode-collate-locale-uk \ + perl-module-unicode-collate-locale-ur \ + perl-module-unicode-collate-locale-vi \ + perl-module-unicode-collate-locale-wae \ + perl-module-unicode-collate-locale-wo \ + perl-module-unicode-collate-locale-yo \ + perl-module-unicode-collate-locale-zh \ + perl-module-unicode-collate-locale-zh-big5 \ + perl-module-unicode-collate-locale-zh-gb \ + perl-module-unicode-collate-locale-zh-pin \ + perl-module-unicode-collate-locale-zh-strk \ + perl-module-unicode-collate-locale-zh-zhu \ perl-module-unicode-normalize \ perl-module-unicode-ucd \ perl-module-unicore \ @@ -609,8 +791,10 @@ RDEPENDS_${PN} += " \ perl-module-user-grent \ perl-module-user-pwent \ perl-module-utf8 \ + perl-module-utf8-heavy \ perl-module-version \ perl-module-version-regex \ perl-module-version-vpp \ + perl-module-vmsish \ perl-module-xsloader \ " diff --git a/meta-freedesktop/recipes-devtools/pkgconfig/pkgconfig_0.28.bbappend b/meta-freedesktop/recipes-devtools/pkgconfig/pkgconfig_0.28.bbappend deleted file mode 100644 index 18fee09..0000000 --- a/meta-freedesktop/recipes-devtools/pkgconfig/pkgconfig_0.28.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI += "\ - file://pkg-config-overrides.patch \ - " -EXTRA_OECONF = "--with-internal-glib" diff --git a/meta-freedesktop/recipes-devtools/pkgconfig/pkgconfig_git.bbappend b/meta-freedesktop/recipes-devtools/pkgconfig/pkgconfig_git.bbappend new file mode 100644 index 0000000..c8b47fc --- /dev/null +++ b/meta-freedesktop/recipes-devtools/pkgconfig/pkgconfig_git.bbappend @@ -0,0 +1,3 @@ +EXTRA_OECONF = "--with-internal-glib" +# We want the ability to override .pc variables +SRCREV = "ae0a8b1ad5e40f68fc09ffedac215e038a50f070" diff --git a/meta-freedesktop/recipes-devtools/python/python3-pip_7.1.0.bb b/meta-freedesktop/recipes-devtools/python/python3-pip_7.1.0.bb deleted file mode 100644 index 271e8a4..0000000 --- a/meta-freedesktop/recipes-devtools/python/python3-pip_7.1.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "The PyPA recommended tool for installing Python packages" -sHOMEPAGEsss = "https://pypi.python.org/pypi/pip" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=45665b53032c02b35e29ddab8e61fa91" - -SRCNAME = "pip" -DEPENDS += "python3 python3-distribute-native" - -SRC_URI = " \ - http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "d935ee9146074b1d3f26c5f0acfd120e" -SRC_URI[sha256sum] = "d5275ba3221182a5dd1b6bcfbfc5ec277fb399dd23226d6fa018048f7e0f10f2" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils3 - -DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages" - -do_install_prepend() { - install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages -} - -# Use setuptools site.py instead, avoid shared state issue -do_install_append() { - rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/site.py - rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/__pycache__/site.cpython-33.pyc -} - -RDEPENDS_${PN} = "\ - python3-compile \ - python3-io \ - python3-json \ - python3-netserver \ - python3-setuptools \ - python3-unixadmin \ - python3-xmlrpc \ -" diff --git a/meta-freedesktop/recipes-devtools/python/python3/999-distutils-fix-unset-env.patch b/meta-freedesktop/recipes-devtools/python/python3/999-distutils-fix-unset-env.patch deleted file mode 100644 index ac98269..0000000 --- a/meta-freedesktop/recipes-devtools/python/python3/999-distutils-fix-unset-env.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -up Python-3.3.2/Lib/distutils/sysconfig.py.build_sys_envs Python-3.3.2/Lib/distutils/sysconfig.py ---- Python-3.3.2/Lib/distutils/sysconfig.py.build_sys_envs 2015-03-03 10:11:38.061996515 +0100 -+++ Python-3.3.2/Lib/distutils/sysconfig.py 2015-03-03 10:19:24.947068402 +0100 -@@ -15,11 +15,24 @@ import sys - - from .errors import DistutilsPlatformError - -+BUILD_SYS=os.getenv("BUILD_SYS") -+if BUILD_SYS == None: -+ BUILD_SYS="" -+HOST_SYS=os.getenv("HOST_SYS") -+if HOST_SYS == None: -+ HOST_SYS="" -+STAGING_INCDIR=os.getenv("STAGING_INCDIR") -+if STAGING_INCDIR == None: -+ STAGING_INCDIR="" -+STAGING_LIBDIR=os.getenv("STAGING_LIBDIR") -+if STAGING_LIBDIR == None: -+ STAGING_LIBDIR="" -+ - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) --BASE_PREFIX = os.path.normpath(sys.base_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) --BASE_EXEC_PREFIX= os.path.normpath(sys.base_exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+PREFIX = os.path.normpath(sys.prefix).replace(BUILD_SYS, HOST_SYS) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( BUILD_SYS, HOST_SYS ) -+BASE_PREFIX = os.path.normpath(sys.base_prefix).replace( BUILD_SYS, HOST_SYS ) -+BASE_EXEC_PREFIX= os.path.normpath(sys.base_exec_prefix).replace( BUILD_SYS, HOST_SYS ) - - - # Path to the base directory of the project. On Windows the binary may -@@ -82,7 +95,6 @@ def get_python_version(): - """ - return sys.version[:3] - -- - def get_python_inc(plat_specific=0, prefix=None): - """Return the directory containing installed Python header files. - -@@ -94,8 +106,8 @@ def get_python_inc(plat_specific=0, pref - If 'prefix' is supplied, use it instead of sys.base_prefix or - sys.base_exec_prefix -- i.e., ignore 'plat_specific'. - """ -- if prefix is None and os.environ['STAGING_INCDIR'] != "": -- prefix = os.environ['STAGING_INCDIR'].rstrip('include') -+ if prefix is None and STAGING_INCDIR != "": -+ prefix = STAGING_INCDIR.rstrip('include') - elif prefix is None: - prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX - if os.name == "posix": -@@ -124,7 +136,6 @@ def get_python_inc(plat_specific=0, pref - "I don't know where Python installs its C header files " - "on platform '%s'" % os.name) - -- - def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): - """Return the directory containing the Python library (standard or - site additions). -@@ -139,9 +150,9 @@ def get_python_lib(plat_specific=0, stan - If 'prefix' is supplied, use it instead of sys.base_prefix or - sys.base_exec_prefix -- i.e., ignore 'plat_specific'. - """ -- if prefix is None and os.environ['STAGING_LIBDIR'] != "": -- lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] -- prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) -+ if prefix is None and STAGING_LIBDIR != "": -+ lib_basename = STAGING_LIBDIR.split('/')[-1] -+ prefix = STAGING_LIBDIR.rstrip(lib_basename) - else: - lib_basename = sys.lib - -@@ -264,7 +275,7 @@ def get_config_h_filename(): - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+ return os.path.join(inc_dir, config_h).replace( BUILD_SYS, HOST_SYS ) - - - def get_makefile_filename(): -@@ -273,7 +284,7 @@ def get_makefile_filename(): - return os.path.join(_sys_home or project_base, "Makefile") - lib_dir = get_python_lib(plat_specific=0, standard_lib=1) - config_file = 'config-{}{}'.format(get_python_version(), build_flags) -- return os.path.join(lib_dir, config_file, 'Makefile').replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+ return os.path.join(lib_dir, config_file, 'Makefile').replace( BUILD_SYS, HOST_SYS ) - - - def parse_config_h(fp, g=None): diff --git a/meta-freedesktop/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch b/meta-freedesktop/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch deleted file mode 100644 index f26bd38..0000000 --- a/meta-freedesktop/recipes-devtools/python/python3/setup.py-find-libraries-in-staging-dirs.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch setup.py so that the detect_modules() function looks for required -libraries and headers in STAGING_LIBDIR / STAGING_INCDIR. - -Without this patch, several extension modules are not built, even though -their dependencies are present in the compiler's search paths. -The result is the following warning, and ultimately incomplete packages: - -| The necessary bits to build these optional modules were not found: -| _bz2 _curses_panel _dbm -| _gdbm _lzma _sqlite3 -| nis readline zlib -| To find the necessary bits, look in setup.py in detect_modules() for the module's name. - -Upstream-Status: Inappropriate [Cross compile specific] - -Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> - -Index: Python-3.4.3/setup.py -=================================================================== ---- Python-3.4.3.orig/setup.py -+++ Python-3.4.3/setup.py -@@ -521,6 +521,8 @@ class PyBuildExt(build_ext): - else: - lib_dirs = self.compiler.library_dirs[:] - inc_dirs = self.compiler.include_dirs[:] -+ lib_dirs.append(os.environ.get('STAGING_LIBDIR')) -+ inc_dirs.append(os.environ.get('STAGING_INCDIR')) - exts = [] - missing = [] - diff --git a/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend b/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend deleted file mode 100644 index b62d2bd..0000000 --- a/meta-freedesktop/recipes-devtools/python/python3_3.3.3.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -FILES_${PN}-compression="${libdir}/python3.3/gzip.* ${libdir}/python3.3/zipfile.* ${libdir}/python3.3/tarfile.* ${libdir}/python3.3/lib-dynload/_bz2.*.so " -FILES_${PN}-crypt="${libdir}/python3.3/hashlib.* ${libdir}/python3.3/md5.* ${libdir}/python3.3/sha.* ${libdir}/python3.3/lib-dynload/_crypt.*.so ${libdir}/python3.3/lib-dynload/_hashlib.*.so ${libdir}/python3.3/lib-dynload/_sha256.*.so ${libdir}/python3.3/lib-dynload/_sha512.*.so " -FILES_${PN}-datetime="${libdir}/python3.3/_strptime.* ${libdir}/python3.3/calendar.* ${libdir}/python3.3/lib-dynload/_datetime.*.so " -FILES_${PN}-lang="${libdir}/python3.3/lib-dynload/_bisect.*.so ${libdir}/python3.3/lib-dynload/_collections.*.so ${libdir}/python3.3/lib-dynload/_heapq.*.so ${libdir}/python3.3/lib-dynload/_weakref.*.so ${libdir}/python3.3/lib-dynload/_functools.*.so ${libdir}/python3.3/lib-dynload/array.*.so ${libdir}/python3.3/lib-dynload/itertools.*.so ${libdir}/python3.3/lib-dynload/operator.*.so ${libdir}/python3.3/lib-dynload/parser.*.so ${libdir}/python3.3/atexit.* ${libdir}/python3.3/lib-dynload/atexit.*.so ${libdir}/python3.3/bisect.* ${libdir}/python3.3/code.* ${libdir}/python3.3/codeop.* ${libdir}/python3.3/collections.* ${libdir}/python3.3/dis.* ${libdir}/python3.3/functools.* ${libdir}/python3.3/heapq.* ${libdir}/python3.3/inspect.* ${libdir}/python3.3/keyword.* ${libdir}/python3.3/opcode.* ${libdir}/python3.3/symbol.* ${libdir}/python3.3/repr.* ${libdir}/python3.3/token.* ${libdir}/python3.3/tokenize.* ${libdir}/python3.3/traceback.* ${libdir}/python3.3/weakref.* " -FILES_${PN}-numbers="${libdir}/python3.3/decimal.* ${libdir}/python3.3/numbers.* ${libdir}/python3.3/lib-dynload/_decimal.*.so" -FILES_${PN}-pickle="${libdir}/python3.3/pickle.* ${libdir}/python3.3/shelve.* ${libdir}/python3.3/lib-dynload/cPickle.*.so ${libdir}/python3.3/pickletools.* ${libdir}/python3.3/lib-dynload/_pickle.*.so" -FILES_${PN}-subprocess="${libdir}/python3.3/subprocess.* ${libdir}/python3.3/lib-dynload/_posixsubprocess.*.so" - -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI += "\ - file://999-distutils-fix-unset-env.patch \ - file://setup.py-find-libraries-in-staging-dirs.patch \ - file://usercustomize.py \ - " -SRC_URI_remove = "file://04-default-is-optimized.patch" - -py_package_preprocess () { - # copy back the old Makefile to fix target package - install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile - # Remove references to buildmachine paths in target Makefile and _sysconfigdata - sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \ - ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \ - ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py -} - -do_install_append() { - install -m 0755 ${WORKDIR}/usercustomize.py ${D}${libdir}/python3.3/usercustomize.py -} diff --git a/meta-freedesktop/recipes-devtools/python/python3_3.4.3.bbappend b/meta-freedesktop/recipes-devtools/python/python3_3.4.3.bbappend new file mode 100644 index 0000000..1dc99e7 --- /dev/null +++ b/meta-freedesktop/recipes-devtools/python/python3_3.4.3.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI += "\ + file://usercustomize.py \ + " +SRC_URI_remove = "file://04-default-is-optimized.patch" + +do_install_append() { + install -m 0755 ${WORKDIR}/usercustomize.py ${D}${libdir}/python3.4/usercustomize.py +} diff --git a/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend b/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend index 6c98876..bf25949 100644 --- a/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend +++ b/meta-freedesktop/recipes-devtools/python/python_2.7.9.bbappend @@ -2,15 +2,6 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI += "\ file://usercustomize.py \ " -py_package_preprocess () { - # copy back the old Makefile to fix target package - install -m 0644 Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile - - # Remove references to buildmachine paths in target Makefile and _sysconfigdata - sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \ - ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \ - ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py -} do_install_append() { install -m 0755 ${WORKDIR}/usercustomize.py ${D}${libdir}/python2.7/usercustomize.py diff --git a/meta-freedesktop/recipes-devtools/ruby/ruby.inc b/meta-freedesktop/recipes-devtools/ruby/ruby.inc deleted file mode 100644 index ba60191..0000000 --- a/meta-freedesktop/recipes-devtools/ruby/ruby.inc +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "An interpreter of object-oriented scripting language" -DESCRIPTION = "Ruby is an interpreted scripting language for quick \ -and easy object-oriented programming. It has many features to process \ -text files and to do system management tasks (as in Perl). \ -It is simple, straight-forward, and extensible. \ -" -HOMEPAGE = "http://www.ruby-lang.org/" -SECTION = "devel/ruby" -LICENSE = "Ruby | BSD | GPLv2" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \ - file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=c440adb575ba4e6e2344c2630b6a5584\ -" - -DEPENDS = "ruby-native zlib openssl tcl libyaml db gdbm readline" -DEPENDS_class-native = "libyaml-native" - -SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" -SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ - file://extmk.patch \ -" - -S = "${WORKDIR}/ruby-${PV}" - -inherit autotools - - -# This snippet lets compiled extensions which rely on external libraries, -# such as zlib, compile properly. If we don't do this, then when extmk.rb -# runs, it uses the native libraries instead of the target libraries, and so -# none of the linking operations succeed -- which makes extconf.rb think -# that the libraries aren't available and hence that the extension can't be -# built. - -do_configure_prepend() { - sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk - rm -rf ${S}/ruby/ -} diff --git a/meta-freedesktop/recipes-devtools/ruby/ruby/extmk.patch b/meta-freedesktop/recipes-devtools/ruby/ruby/extmk.patch deleted file mode 100644 index 8b68450..0000000 --- a/meta-freedesktop/recipes-devtools/ruby/ruby/extmk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb ---- ruby-1.8.7-p248.orig/ext/extmk.rb 2009-12-24 03:01:58.000000000 -0600 -+++ ruby-1.8.7-p248/ext/extmk.rb 2010-02-12 15:55:27.370061558 -0600 -@@ -354,8 +354,8 @@ - $ruby = '$(topdir)/miniruby' + EXEEXT - end - $ruby << " -I'$(topdir)'" -+$ruby << " -I'$(top_srcdir)/lib'" - unless CROSS_COMPILING -- $ruby << " -I'$(top_srcdir)/lib'" - $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout - $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb" - ENV["RUBYLIB"] = "-" diff --git a/meta-freedesktop/recipes-devtools/ruby/ruby_2.2.2.bb b/meta-freedesktop/recipes-devtools/ruby/ruby_2.2.2.bb deleted file mode 100644 index 78c943c..0000000 --- a/meta-freedesktop/recipes-devtools/ruby/ruby_2.2.2.bb +++ /dev/null @@ -1,42 +0,0 @@ -require ruby.inc - -SRC_URI[md5sum] = "326e99ddc75381c7b50c85f7089f3260" -SRC_URI[sha256sum] = "5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44" - -# it's unknown to configure script, but then passed to extconf.rb -# maybe it's not really needed as we're hardcoding the result with -# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch -UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo" - -PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" - -PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" -PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp" -PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo," - -EXTRA_OECONF = "\ - --disable-versioned-paths \ - --disable-rpath \ - --disable-dtrace \ - --enable-shared \ - --enable-load-relative \ -" - -EXTRA_OEMAKE = " \ - LIBRUBYARG='-lruby-static' \ -" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -FILES_${PN} += "${datadir}/rubygems \ - ${datadir}/ri" - -FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \ - ${libdir}/ruby/*/*/.debug \ - ${libdir}/ruby/*/*/*/.debug \ - ${libdir}/ruby/*/*/*/*/.debug" - -BBCLASSEXTEND = "native" diff --git a/meta-freedesktop/recipes-extended/bash/bash_4.3.bbappend b/meta-freedesktop/recipes-extended/bash/bash_4.3.30.bbappend index e154a0b..e154a0b 100644 --- a/meta-freedesktop/recipes-extended/bash/bash_4.3.bbappend +++ b/meta-freedesktop/recipes-extended/bash/bash_4.3.30.bbappend diff --git a/meta-freedesktop/recipes-multimedia/webm/libvpx_1.3.0.bb b/meta-freedesktop/recipes-multimedia/webm/libvpx_1.5.0.bb index eb19a57..563745b 100644 --- a/meta-freedesktop/recipes-multimedia/webm/libvpx_1.3.0.bb +++ b/meta-freedesktop/recipes-multimedia/webm/libvpx_1.5.0.bb @@ -7,13 +7,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2 \ - file://libvpx-configure-support-blank-prefix.patch \ - file://0001-configure.sh-quote-local-variables.patch" -SRC_URI[md5sum] = "14783a148872f2d08629ff7c694eb31f" -SRC_URI[sha256sum] = "d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9" - -S = "${WORKDIR}/libvpx-v${PV}" +SRC_URI += "http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${PV}.tar.bz2" +SRC_URI[md5sum] = "49e59dd184caa255886683facea56fca" +SRC_URI[sha256sum] = "306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797" # ffmpeg links with this and fails # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' diff --git a/meta-freedesktop/recipes-multimedia/webm/libwebp_0.4.0.bb b/meta-freedesktop/recipes-multimedia/webm/libwebp_0.4.0.bb deleted file mode 100644 index 7663b3b..0000000 --- a/meta-freedesktop/recipes-multimedia/webm/libwebp_0.4.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "WebP is an image format designed for the Web" -DESCRIPTION = "WebP is a method of lossy and lossless compression that can be \ - used on a large variety of photographic, translucent and \ - graphical images found on the web. The degree of lossy \ - compression is adjustable so a user can choose the trade-off \ - between file size and image quality. WebP typically achieves \ - an average of 30% more compression than JPEG and JPEG 2000, \ - without loss of image quality." -HOMEPAGE = "https://developers.google.com/speed/webp/" -SECTION = "libs" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://PATENTS;md5=7ec8a34de2073ea13ea2991006246d20" - -DEPENDS = "giflib" - -SRC_URI = "https://webp.googlecode.com/files/${BP}.tar.gz" -SRC_URI[md5sum] = "c8dd1d26eb9566833aba269b86d97e68" -SRC_URI[sha256sum] = "31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69" - -EXTRA_OECONF = " \ - --disable-experimental \ - --disable-wic \ - --enable-libwebpmux \ - --enable-libwebpdemux \ - --enable-threading \ -" - -inherit autotools lib_package - -PACKAGECONFIG ??= "" - -# libwebpdecoder is a subset of libwebp, don't build it unless requested -PACKAGECONFIG[decoder] = "--enable-libwebpdecoder,--disable-libwebpdecoder" - -# Apply for examples programs: cwebp and dwebp -PACKAGECONFIG[jpeg] = ",ac_cv_header_jpeglib_h=no,jpeg" -PACKAGECONFIG[png] = ",ac_cv_header_png_h=no,libpng" -PACKAGECONFIG[tiff] = ",ac_cv_header_tiffio_h=no,tiff" - -# Apply only for example program vwebp -PACKAGECONFIG[gl] = ",,mesa-glut" - -PACKAGES =+ "${PN}-gif2webp" - -DESCRIPTION_${PN}-gif2webp = "Simple tool to convert animated GIFs to WebP" -FILES_${PN}-gif2webp = "${bindir}/gif2webp" diff --git a/meta-freedesktop/recipes-support/iso-codes/iso-codes_1.4.bb b/meta-freedesktop/recipes-support/iso-codes/iso-codes_1.4.bb deleted file mode 100644 index ed89a12..0000000 --- a/meta-freedesktop/recipes-support/iso-codes/iso-codes_1.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "ISO language, territory, currency, script codes and their translations" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" - -PR = "r2" - -SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2" -SRC_URI[md5sum] = "4073466e57df23d39721513219e4f7ae" -SRC_URI[sha256sum] = "0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97" - -# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which -# are inhibited by allarch -DEPENDS = "gettext-native" - -inherit autotools allarch - -FILES_${PN} += "${datadir}/xml/" diff --git a/meta-freedesktop/recipes-support/libpcre/libpcre_8.36.bbappend b/meta-freedesktop/recipes-support/libpcre/libpcre_8.38.bbappend index e9aa89b..e9aa89b 100644 --- a/meta-freedesktop/recipes-support/libpcre/libpcre_8.36.bbappend +++ b/meta-freedesktop/recipes-support/libpcre/libpcre_8.38.bbappend diff --git a/meta-freedesktop/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch b/meta-freedesktop/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch deleted file mode 100644 index 3c4a00e..0000000 --- a/meta-freedesktop/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch +++ /dev/null @@ -1,32 +0,0 @@ -# HG changeset patch -# User Kirill Simonov <xi@resolvent.net> -# Date 1417197312 21600 -# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2 -# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33 -Removed invalid simple key assertion (thank to Jonathan Gray). - -The patch comes from - -https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2 - -Upstream-Status: Backport - -Signed-off-by: Yue Tao <yue.tao@windriver.com> - -diff -r 053f53a381ff -r 2b9156756423 src/scanner.c ---- a/src/scanner.c Wed Mar 26 13:55:54 2014 -0500 -+++ b/src/scanner.c Fri Nov 28 11:55:12 2014 -0600 -@@ -1106,13 +1106,6 @@ - && parser->indent == (ptrdiff_t)parser->mark.column); - - /* -- * A simple key is required only when it is the first token in the current -- * line. Therefore it is always allowed. But we add a check anyway. -- */ -- -- assert(parser->simple_key_allowed || !required); /* Impossible. */ -- -- /* - * If the current position may start a simple key, save it. - */ - diff --git a/meta-freedesktop/recipes-support/libyaml/libyaml_0.1.6.bb b/meta-freedesktop/recipes-support/libyaml/libyaml_0.1.6.bb deleted file mode 100644 index b015577..0000000 --- a/meta-freedesktop/recipes-support/libyaml/libyaml_0.1.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "LibYAML is a YAML 1.1 parser and emitter written in C." -DESCRIPTION = "LibYAML is a C library for parsing and emitting data in YAML 1.1, \ -a human-readable data serialization format. " -HOMEPAGE = "http://pyyaml.org/wiki/LibYAML" -SECTION = "libs/devel" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17" - -SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \ - file://libyaml-CVE-2014-9130.patch \ - " - -SRC_URI[md5sum] = "5fe00cda18ca5daeb43762b80c38e06e" -SRC_URI[sha256sum] = "7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749" - -S = "${WORKDIR}/yaml-${PV}" - -inherit autotools - -BBCLASSEXTEND = "native" diff --git a/yocto b/yocto -Subproject 9845a542a76156adb5aef6fd33ad5bc5777acf6 +Subproject 049be17b533d7c592dae8e0f33ddbae54639a77 |