Re: [oe] [meta-oe][PATCH] mpv: Media Player
I did and there was still: FILES_${PN} += "${prefix}" that's why I've asked again here. On Thu, Mar 10, 2016 at 8:40 AM, Gary Thomaswrote: > On 2016-03-10 08:33, Martin Jansa wrote: > >> On Thu, Mar 10, 2016 at 05:42:39AM +0100, Gary Thomas wrote: >> >>> On 2016-03-09 20:15, Martin Jansa wrote: >>> On Wed, Mar 09, 2016 at 07:20:33AM +0100, Gary Thomas wrote: > mpv is a fork of mplayer2 and MPlayer. It shares some features with > the former projects while introducing many more. > > Signed-off-by: Gary Thomas > --- >meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 60 > >1 file changed, 60 insertions(+) >create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > > diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > new file mode 100644 > index 000..37e4b02 > --- /dev/null > +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > @@ -0,0 +1,60 @@ > +SUMMARY = "Open Source multimedia player" > +SECTION = "multimedia" > +HOMEPAGE = "http://www.mpv.io/; > +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv libxscrnsaver" > + > +# Depends on xsp, libxv, virtual/libx11, libxscrnsaver > +REQUIRED_DISTRO_FEATURES = "x11" > + > +LICENSE = "GPLv2+" > +LIC_FILES_CHKSUM = > "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" > + > +SRC_URI = " > https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ > + > http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \ > +" > +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" > +SRC_URI[mpv.sha256sum] = > "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" > +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" > +SRC_URI[waf.sha256sum] = > "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" > + > +EXTRA_OECONF = " \ > +--prefix=${D}/usr \ > why not ${prefix} and does it really need to be prefixed with ${D} (unlike mandir bellow)? Ugly waf. >>> >> What about ${D}? >> >> +--mandir=${mandir} \ > +--target=${SIMPLE_TARGET_SYS} \ > +--disable-gl \ > +--disable-libsmbclient \ > +--disable-libass \ > +--disable-lua \ > +--disable-libass-osd \ > +--disable-encoding \ > +--disable-libbluray \ > +--disable-dvdread \ > +--disable-dvdnav \ > +--disable-cdda \ > +--disable-enca \ > +--disable-libguess \ > +--disable-uchardet \ > +--disable-rubberband \ > +--disable-lcms2 \ > +--disable-vapoursynth \ > +--disable-vapoursynth-lazy \ > +--enable-libarchive \ > +" > + > +do_configure() { > +if [ ! -L ../waf ]; then > +chmod a+x ../waf-1.8.12 > + ln -s waf-1.8.12 ../waf > +fi > +../waf configure ${EXTRA_OECONF} > +} > + > +do_compile () { > +../waf build > +} > + > +do_install() { > +../waf install > +} > + > +FILES_${PN} += "/usr/" > ${prefix}? Does it install files in strange directories not covered by standard FILES? >>> Use of ${prefix} does seem correct, I've updated the recipe. >>> Patch v2 has been dispatched, including a required update to >>> the libass package which was necessary to get a fully functional >>> mpv. >>> >> >> Does it install files in strange directories not covered by standard >> FILES? >> > > No, but it doesn't seem to have any notion of adjusting the install > directory except at configure time, hence ${D}${prefix} > > Please refer to the new patchset to see how I've changed the recipe. > > > -- > > Gary Thomas | Consulting for the > MLB Associates |Embedded world > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] mpv: Media Player
On 2016-03-10 08:33, Martin Jansa wrote: On Thu, Mar 10, 2016 at 05:42:39AM +0100, Gary Thomas wrote: On 2016-03-09 20:15, Martin Jansa wrote: On Wed, Mar 09, 2016 at 07:20:33AM +0100, Gary Thomas wrote: mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more. Signed-off-by: Gary Thomas--- meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 60 1 file changed, 60 insertions(+) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb new file mode 100644 index 000..37e4b02 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb @@ -0,0 +1,60 @@ +SUMMARY = "Open Source multimedia player" +SECTION = "multimedia" +HOMEPAGE = "http://www.mpv.io/; +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv libxscrnsaver" + +# Depends on xsp, libxv, virtual/libx11, libxscrnsaver +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" + +SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \ +" +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" +SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" + +EXTRA_OECONF = " \ +--prefix=${D}/usr \ why not ${prefix} and does it really need to be prefixed with ${D} (unlike mandir bellow)? Ugly waf. What about ${D}? +--mandir=${mandir} \ +--target=${SIMPLE_TARGET_SYS} \ +--disable-gl \ +--disable-libsmbclient \ +--disable-libass \ +--disable-lua \ +--disable-libass-osd \ +--disable-encoding \ +--disable-libbluray \ +--disable-dvdread \ +--disable-dvdnav \ +--disable-cdda \ +--disable-enca \ +--disable-libguess \ +--disable-uchardet \ +--disable-rubberband \ +--disable-lcms2 \ +--disable-vapoursynth \ +--disable-vapoursynth-lazy \ +--enable-libarchive \ +" + +do_configure() { +if [ ! -L ../waf ]; then +chmod a+x ../waf-1.8.12 + ln -s waf-1.8.12 ../waf +fi +../waf configure ${EXTRA_OECONF} +} + +do_compile () { +../waf build +} + +do_install() { +../waf install +} + +FILES_${PN} += "/usr/" ${prefix}? Does it install files in strange directories not covered by standard FILES? Use of ${prefix} does seem correct, I've updated the recipe. Patch v2 has been dispatched, including a required update to the libass package which was necessary to get a fully functional mpv. Does it install files in strange directories not covered by standard FILES? No, but it doesn't seem to have any notion of adjusting the install directory except at configure time, hence ${D}${prefix} Please refer to the new patchset to see how I've changed the recipe. -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] mpv: Media Player
On Thu, Mar 10, 2016 at 05:42:39AM +0100, Gary Thomas wrote: > On 2016-03-09 20:15, Martin Jansa wrote: > > On Wed, Mar 09, 2016 at 07:20:33AM +0100, Gary Thomas wrote: > >> mpv is a fork of mplayer2 and MPlayer. It shares some features with the > >> former projects while introducing many more. > >> > >> Signed-off-by: Gary Thomas> >> --- > >> meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 60 > >> > >> 1 file changed, 60 insertions(+) > >> create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > >> > >> diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > >> b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > >> new file mode 100644 > >> index 000..37e4b02 > >> --- /dev/null > >> +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > >> @@ -0,0 +1,60 @@ > >> +SUMMARY = "Open Source multimedia player" > >> +SECTION = "multimedia" > >> +HOMEPAGE = "http://www.mpv.io/; > >> +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv libxscrnsaver" > >> + > >> +# Depends on xsp, libxv, virtual/libx11, libxscrnsaver > >> +REQUIRED_DISTRO_FEATURES = "x11" > >> + > >> +LICENSE = "GPLv2+" > >> +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" > >> + > >> +SRC_URI = > >> "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ > >> + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \ > >> +" > >> +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" > >> +SRC_URI[mpv.sha256sum] = > >> "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" > >> +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" > >> +SRC_URI[waf.sha256sum] = > >> "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" > >> + > >> +EXTRA_OECONF = " \ > >> +--prefix=${D}/usr \ > > why not ${prefix} and does it really need to be prefixed with ${D} > > (unlike mandir bellow)? Ugly waf. What about ${D}? > >> +--mandir=${mandir} \ > >> +--target=${SIMPLE_TARGET_SYS} \ > >> +--disable-gl \ > >> +--disable-libsmbclient \ > >> +--disable-libass \ > >> +--disable-lua \ > >> +--disable-libass-osd \ > >> +--disable-encoding \ > >> +--disable-libbluray \ > >> +--disable-dvdread \ > >> +--disable-dvdnav \ > >> +--disable-cdda \ > >> +--disable-enca \ > >> +--disable-libguess \ > >> +--disable-uchardet \ > >> +--disable-rubberband \ > >> +--disable-lcms2 \ > >> +--disable-vapoursynth \ > >> +--disable-vapoursynth-lazy \ > >> +--enable-libarchive \ > >> +" > >> + > >> +do_configure() { > >> +if [ ! -L ../waf ]; then > >> +chmod a+x ../waf-1.8.12 > >> + ln -s waf-1.8.12 ../waf > >> +fi > >> +../waf configure ${EXTRA_OECONF} > >> +} > >> + > >> +do_compile () { > >> +../waf build > >> +} > >> + > >> +do_install() { > >> +../waf install > >> +} > >> + > >> +FILES_${PN} += "/usr/" > > > > ${prefix}? > > > > Does it install files in strange directories not covered by standard > > FILES? > > > > Use of ${prefix} does seem correct, I've updated the recipe. > Patch v2 has been dispatched, including a required update to > the libass package which was necessary to get a fully functional > mpv. Does it install files in strange directories not covered by standard FILES? -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/1] waf-samba.bbclass: move to meta-networking
From: Jackie HuangThe recipes that are using waf-samba were all moved to meta-networking, so move the bbclass and related cross-answers files as well. Signed-off-by: Jackie Huang --- {meta-oe => meta-networking}/classes/waf-samba.bbclass | 0 meta-networking/conf/layer.conf| 3 +++ {meta-oe => meta-networking}/files/waf-cross-answers/README| 0 .../files/waf-cross-answers/cross-answers-aarch64.txt | 0 .../files/waf-cross-answers/cross-answers-arm.txt | 0 .../files/waf-cross-answers/cross-answers-i586.txt | 0 .../files/waf-cross-answers/cross-answers-i686.txt | 0 .../files/waf-cross-answers/cross-answers-mips.txt | 0 .../files/waf-cross-answers/cross-answers-mips64.txt | 0 .../files/waf-cross-answers/cross-answers-powerpc.txt | 0 .../files/waf-cross-answers/cross-answers-powerpc64.txt| 0 .../files/waf-cross-answers/cross-answers-x86_64.txt | 0 meta-oe/conf/layer.conf| 1 - 13 files changed, 3 insertions(+), 1 deletion(-) rename {meta-oe => meta-networking}/classes/waf-samba.bbclass (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/README (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-aarch64.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-arm.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-i586.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-i686.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-mips.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-mips64.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-powerpc.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-powerpc64.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-x86_64.txt (100%) diff --git a/meta-oe/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass similarity index 100% rename from meta-oe/classes/waf-samba.bbclass rename to meta-networking/classes/waf-samba.bbclass diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 63bb07d..5fd636a 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -18,3 +18,6 @@ LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" LICENSE_PATH += "${LAYERDIR}/licenses" + +# used by waf-samba.bbclass +WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers" diff --git a/meta-oe/files/waf-cross-answers/README b/meta-networking/files/waf-cross-answers/README similarity index 100% rename from meta-oe/files/waf-cross-answers/README rename to meta-networking/files/waf-cross-answers/README diff --git a/meta-oe/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt similarity index 100% rename from meta-oe/files/waf-cross-answers/cross-answers-aarch64.txt rename to meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt diff --git a/meta-oe/files/waf-cross-answers/cross-answers-arm.txt b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt similarity index 100% rename from meta-oe/files/waf-cross-answers/cross-answers-arm.txt rename to meta-networking/files/waf-cross-answers/cross-answers-arm.txt diff --git a/meta-oe/files/waf-cross-answers/cross-answers-i586.txt b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt similarity index 100% rename from meta-oe/files/waf-cross-answers/cross-answers-i586.txt rename to meta-networking/files/waf-cross-answers/cross-answers-i586.txt diff --git a/meta-oe/files/waf-cross-answers/cross-answers-i686.txt b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt similarity index 100% rename from meta-oe/files/waf-cross-answers/cross-answers-i686.txt rename to meta-networking/files/waf-cross-answers/cross-answers-i686.txt diff --git a/meta-oe/files/waf-cross-answers/cross-answers-mips.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt similarity index 100% rename from meta-oe/files/waf-cross-answers/cross-answers-mips.txt rename to meta-networking/files/waf-cross-answers/cross-answers-mips.txt diff --git a/meta-oe/files/waf-cross-answers/cross-answers-mips64.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt similarity index 100% rename from meta-oe/files/waf-cross-answers/cross-answers-mips64.txt rename to meta-networking/files/waf-cross-answers/cross-answers-mips64.txt diff --git
[oe] [meta-networking][PATCH 0/1] waf-samba.bbclass: move to meta-networking
From: Jackie HuangThis is a follow-up from the discussion in the thread: "Re: [oe] Still many meta-networking changes waiting in patchwork/master-next" -- The following changes since commit a1e135a48add7575682bf53db5e02e753580: Revert "toybox: upgrade to 0.7.0" (2016-03-07 13:02:19 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/t_move-waf-samba_160310-0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/t_move-waf-samba_160310-0 Jackie Huang (1): waf-samba.bbclass: move to meta-networking {meta-oe => meta-networking}/classes/waf-samba.bbclass | 0 meta-networking/conf/layer.conf| 3 +++ {meta-oe => meta-networking}/files/waf-cross-answers/README| 0 .../files/waf-cross-answers/cross-answers-aarch64.txt | 0 .../files/waf-cross-answers/cross-answers-arm.txt | 0 .../files/waf-cross-answers/cross-answers-i586.txt | 0 .../files/waf-cross-answers/cross-answers-i686.txt | 0 .../files/waf-cross-answers/cross-answers-mips.txt | 0 .../files/waf-cross-answers/cross-answers-mips64.txt | 0 .../files/waf-cross-answers/cross-answers-powerpc.txt | 0 .../files/waf-cross-answers/cross-answers-powerpc64.txt| 0 .../files/waf-cross-answers/cross-answers-x86_64.txt | 0 meta-oe/conf/layer.conf| 1 - 13 files changed, 3 insertions(+), 1 deletion(-) rename {meta-oe => meta-networking}/classes/waf-samba.bbclass (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/README (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-aarch64.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-arm.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-i586.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-i686.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-mips.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-mips64.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-powerpc.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-powerpc64.txt (100%) rename {meta-oe => meta-networking}/files/waf-cross-answers/cross-answers-x86_64.txt (100%) -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] mpv: Media Player
On 2016-03-09 20:15, Martin Jansa wrote: On Wed, Mar 09, 2016 at 07:20:33AM +0100, Gary Thomas wrote: mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more. Signed-off-by: Gary Thomas--- meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 60 1 file changed, 60 insertions(+) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb new file mode 100644 index 000..37e4b02 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb @@ -0,0 +1,60 @@ +SUMMARY = "Open Source multimedia player" +SECTION = "multimedia" +HOMEPAGE = "http://www.mpv.io/; +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv libxscrnsaver" + +# Depends on xsp, libxv, virtual/libx11, libxscrnsaver +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" + +SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \ +" +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" +SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" + +EXTRA_OECONF = " \ +--prefix=${D}/usr \ why not ${prefix} and does it really need to be prefixed with ${D} (unlike mandir bellow)? Ugly waf. +--mandir=${mandir} \ +--target=${SIMPLE_TARGET_SYS} \ +--disable-gl \ +--disable-libsmbclient \ +--disable-libass \ +--disable-lua \ +--disable-libass-osd \ +--disable-encoding \ +--disable-libbluray \ +--disable-dvdread \ +--disable-dvdnav \ +--disable-cdda \ +--disable-enca \ +--disable-libguess \ +--disable-uchardet \ +--disable-rubberband \ +--disable-lcms2 \ +--disable-vapoursynth \ +--disable-vapoursynth-lazy \ +--enable-libarchive \ +" + +do_configure() { +if [ ! -L ../waf ]; then +chmod a+x ../waf-1.8.12 + ln -s waf-1.8.12 ../waf +fi +../waf configure ${EXTRA_OECONF} +} + +do_compile () { +../waf build +} + +do_install() { +../waf install +} + +FILES_${PN} += "/usr/" ${prefix}? Does it install files in strange directories not covered by standard FILES? Use of ${prefix} does seem correct, I've updated the recipe. Patch v2 has been dispatched, including a required update to the libass package which was necessary to get a fully functional mpv. -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 1/2] libass: Update to latest version
libass has moved from Google to github.com Also update to the latest version (libass.so.5) Signed-off-by: Gary Thomas--- meta-oe/recipes-multimedia/libass/libass.inc | 7 ++- meta-oe/recipes-multimedia/libass/libass_0.10.1.bb | 5 - meta-oe/recipes-multimedia/libass/libass_0.13.2.bb | 4 3 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libass/libass_0.10.1.bb create mode 100644 meta-oe/recipes-multimedia/libass/libass_0.13.2.bb diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc index 328cd14..a394c56 100644 --- a/meta-oe/recipes-multimedia/libass/libass.inc +++ b/meta-oe/recipes-multimedia/libass/libass.inc @@ -1,5 +1,5 @@ DESCRIPTION = "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. It is mostly compatible with VSFilter." -HOMEPAGE = "http://code.google.com/p/libass/; +HOMEPAGE = "http://github.com/libass/libass/; SECTION = "libs/multimedia" LICENSE = "ISC" @@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ae98663bac55afe5d989919d296f28a" DEPENDS = "enca fontconfig freetype libpng fribidi" -INC_PR = "r1" - -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz; - +SRC_URI = "https://github.com/${PN}/${PN}/releases/download/0.13.2/${BP}.tar.gz; inherit autotools pkgconfig PACKAGECONFIG ??= "" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb b/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb deleted file mode 100644 index 0b32276..000 --- a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${PN}.inc -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "6cace482a013a3c4bf3b31a68ac66026" -SRC_URI[sha256sum] = "629a7e81fff92dea8d0399b818a41fd1b61e381c67a5961b1eaec2efadb14c6c" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb b/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb new file mode 100644 index 000..123c9dd --- /dev/null +++ b/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb @@ -0,0 +1,4 @@ +require ${PN}.inc + +SRC_URI[md5sum] = "b4d82616bb18e8e954b18746a105a3b8" +SRC_URI[sha256sum] = "8baccf663553b62977b1c017d18b3879835da0ef79dc4d3b708f2566762f1d5e" -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/2] mpv: Media Player
mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more. Signed-off-by: Gary Thomas--- meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 65 1 file changed, 65 insertions(+) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb new file mode 100644 index 000..e8c13a4 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb @@ -0,0 +1,65 @@ +SUMMARY = "Open Source multimedia player" +SECTION = "multimedia" +HOMEPAGE = "http://www.mpv.io/; +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ + libxscrnsaver libv4l libxinerama \ +" + +REQUIRED_DISTRO_FEATURES = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" + +SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \ +" +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" +SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" + +inherit pkgconfig + +# Note: both lua and libass are required to get on-screen-display (controls) +PACKAGECONFIG ??= "lua libass" +PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" + +EXTRA_OECONF = " \ +--prefix=${D}${prefix} \ +--target=${SIMPLE_TARGET_SYS} \ +--disable-manpage-build \ +--disable-gl \ +--disable-libsmbclient \ +--disable-encoding \ +--disable-libbluray \ +--disable-dvdread \ +--disable-dvdnav \ +--disable-cdda \ +--disable-enca \ +--disable-libguess \ +--disable-uchardet \ +--disable-rubberband \ +--disable-lcms2 \ +--disable-vapoursynth \ +--disable-vapoursynth-lazy \ +" + +do_configure() { +if [ ! -L ../waf ]; then +chmod a+x ../waf-1.8.12 + ln -s waf-1.8.12 ../waf +fi +../waf configure ${EXTRA_OECONF} +} + +do_compile () { +../waf build +} + +do_install() { +../waf install +} + +FILES_${PN} += "${prefix}" -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 0/2] mpv: Media Player
mpv is a new media player, based on a fork of Mplayer and mplayer2. libass is updated to the latest version (necessary for fully functioning mpv) Gary Thomas (2): libass: Update to latest version mpv: Media Player meta-oe/recipes-multimedia/libass/libass.inc | 7 +-- meta-oe/recipes-multimedia/libass/libass_0.10.1.bb | 5 -- meta-oe/recipes-multimedia/libass/libass_0.13.2.bb | 4 ++ meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 65 ++ 4 files changed, 71 insertions(+), 10 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libass/libass_0.10.1.bb create mode 100644 meta-oe/recipes-multimedia/libass/libass_0.13.2.bb create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] postgresql: Security Advisory-postgresql-CVE-2016-0773
add CVE-2016-0773 patch for avoiding attackers to cause a denial of service (infinite loop or buffer overflow and crash) via a large Unicode character range in a regular expression. Patch comes from: http://git.postgresql.org/gitweb/?p=postgresql.git;a=summary commit 3bb3f42f3749d40b8d4de65871e8d828b18d4a45 Signed-off-by: Zhixiong Chi--- .../files/postgresql-CVE-2016-0773.patch | 222 + meta-oe/recipes-support/postgresql/postgresql.inc | 1 + 2 files changed, 223 insertions(+) create mode 100644 meta-oe/recipes-support/postgresql/files/postgresql-CVE-2016-0773.patch diff --git a/meta-oe/recipes-support/postgresql/files/postgresql-CVE-2016-0773.patch b/meta-oe/recipes-support/postgresql/files/postgresql-CVE-2016-0773.patch new file mode 100644 index 000..0fc9082 --- /dev/null +++ b/meta-oe/recipes-support/postgresql/files/postgresql-CVE-2016-0773.patch @@ -0,0 +1,222 @@ +From 3bb3f42f3749d40b8d4de65871e8d828b18d4a45 Mon Sep 17 00:00:00 2001 +From: Tom Lane +Date: Mon, 8 Feb 2016 10:25:40 -0500 +Subject: [PATCH] Fix some regex issues with out-of-range characters and large + char ranges. + +Previously, our regex code defined CHR_MAX as 0xfffe, which is a +bad choice because it is outside the range of type "celt" (int32). +Characters approaching that limit could lead to infinite loops in logic +such as "for (c = a; c <= b; c++)" where c is of type celt but the +range bounds are chr. Such loops will work safely only if CHR_MAX+1 +is representable in celt, since c must advance to beyond b before the +loop will exit. + +Fortunately, there seems no reason not to restrict CHR_MAX to 0x7ffe. +It's highly unlikely that Unicode will ever assign codes that high, and +none of our other backend encodings need characters beyond that either. + +In addition to modifying the macro, we have to explicitly enforce character +range restrictions on the values of \u, \U, and \x escape sequences, else +the limit is trivially bypassed. + +Also, the code for expanding case-independent character ranges in bracket +expressions had a potential integer overflow in its calculation of the +number of characters it could generate, which could lead to allocating too +small a character vector and then overwriting memory. An attacker with the +ability to supply arbitrary regex patterns could easily cause transient DOS +via server crashes, and the possibility for privilege escalation has not +been ruled out. + +Quite aside from the integer-overflow problem, the range expansion code was +unnecessarily inefficient in that it always produced a result consisting of +individual characters, abandoning the knowledge that we had a range to +start with. If the input range is large, this requires excessive memory. +Change it so that the original range is reported as-is, and then we add on +any case-equivalent characters that are outside that range. With this +approach, we can bound the number of individual characters allowed without +sacrificing much. This patch allows at most 10 individual characters, +which I believe to be more than the number of case pairs existing in +Unicode, so that the restriction will never be hit in practice. + +It's still possible for range() to take awhile given a large character code +range, so also add statement-cancel detection to its loop. The downstream +function dovec() also lacked cancel detection, and could take a long time +given a large output from range(). + +Per fuzz testing by Greg Stark. Back-patch to all supported branches. + +Security: CVE-2016-0773 + +Upstream-Status: Backport + +Signed-off-by: Tom Lane +Signed-off-by: Zhixiong Chi + +Index: postgresql-9.4.5/src/backend/regex/regc_lex.c +=== +--- postgresql-9.4.5.orig/src/backend/regex/regc_lex.c 2015-10-06 03:12:06.0 +0800 postgresql-9.4.5/src/backend/regex/regc_lex.c 2016-03-10 10:29:57.045784317 +0800 +@@ -792,13 +792,13 @@ + break; + case CHR('u'): + c = lexdigits(v, 16, 4, 4); +- if (ISERR()) ++ if (ISERR() || c < CHR_MIN || c > CHR_MAX) + FAILW(REG_EESCAPE); + RETV(PLAIN, c); + break; + case CHR('U'): + c = lexdigits(v, 16, 8, 8); +- if (ISERR()) ++ if (ISERR() || c < CHR_MIN || c > CHR_MAX) + FAILW(REG_EESCAPE); + RETV(PLAIN, c); + break; +@@ -816,7 +816,7 @@ + case CHR('x'): + NOTE(REG_UUNPORT); + c = lexdigits(v, 16, 1, 255); /* REs >255 long outside spec */ +- if (ISERR()) ++ if
[oe] python-cryptography failing to build since openssl upgrade
Do we really need to use that version script for openssl? Here is another failure: http://errors.yoctoproject.org/Errors/Details/54984/ in our local builds we use couple prebuild binaries from 3rdparty, which now aren't compatible with openssl ABI (possibly because of version-script update: http://lists.openembedded.org/pipermail/openembedded-core/2016-March/118433.html ) -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][jethro][PATCH][V2] python-m2crypto: fix SSLv2 symbol issue
On 03/09/2016 11:11 AM, Martin Jansa wrote: > On Wed, Mar 09, 2016 at 09:06:57AM -0800, Armin Kuster wrote: >> From: Armin Kuster>> >> missed using "-D" for OPENSSL_NO_SSL2 swig_features. > > fido version: > http://patchwork.openembedded.org/patch/117291/ > needed -D as well, right? yes. > > I've pushed both to fido-next and jethro-next thanks -armin > >> >> ERROR: Failed to import the "M2Crypto" module: >> .../usr/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined >> symbol: SSLv2_method >> >> disable using SSLv2_method if not supported in openssl. This is now the case >> with the advent of CVE-2016-0800 >> >> Signed-off-by: Armin Kuster >> --- >> ...y_build_with_SSLv2_when_it_is_not_available.patch | 20 >> >> .../python/python-m2crypto_0.21.1.bb | 4 +++- >> 2 files changed, 23 insertions(+), 1 deletion(-) >> create mode 100644 >> meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch >> >> diff --git >> a/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch >> >> b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch >> new file mode 100644 >> index 000..526c23f >> --- /dev/null >> +++ >> b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch >> @@ -0,0 +1,20 @@ >> +Upstream-Status: Backport >> +https://gitlab.com/m2crypto/m2crypto/commit/ac01b38302474920288c1a9eb63fd35fa8d1db5b >> + >> +Signed-off-by: Armin Kuster >> + >> +Index: M2Crypto-0.21.1/SWIG/_ssl.i >> +=== >> +--- M2Crypto-0.21.1.orig/SWIG/_ssl.i >> M2Crypto-0.21.1/SWIG/_ssl.i >> +@@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string >> + %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long; >> + extern const char *SSL_alert_desc_string_long(int); >> + >> ++#ifndef OPENSSL_NO_SSL2 >> + %rename(sslv2_method) SSLv2_method; >> + extern SSL_METHOD *SSLv2_method(void); >> ++#endif >> + %rename(sslv3_method) SSLv3_method; >> + extern SSL_METHOD *SSLv3_method(void); >> + %rename(sslv23_method) SSLv23_method; >> diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb >> b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb >> index ff6203f..9daea5e 100644 >> --- a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb >> +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb >> @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = >> "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" >> >> SRC_URI = >> "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ >> >> file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ >> - file://0001-M2Crypto-Error-fix.patch" >> + file://0001-M2Crypto-Error-fix.patch \ >> + file://dont_try_build_with_SSLv2_when_it_is_not_available.patch" >> >> SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" >> SRC_URI[sha256sum] = >> "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" >> @@ -19,6 +20,7 @@ inherit setuptools >> >> SWIG_FEATURES_x86-64 = "-D__x86_64__" >> SWIG_FEATURES ?= "" >> +SWIG_FEATURES += "-DOPENSSL_NO_SSL2" >> export SWIG_FEATURES >> >> # Get around a problem with swig, but only if the >> -- >> 2.3.5 >> >> -- >> ___ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] mpv: Media Player
On Wed, Mar 09, 2016 at 07:20:33AM +0100, Gary Thomas wrote: > mpv is a fork of mplayer2 and MPlayer. It shares some features with the > former projects while introducing many more. > > Signed-off-by: Gary Thomas> --- > meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 60 > > 1 file changed, 60 insertions(+) > create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > > diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > new file mode 100644 > index 000..37e4b02 > --- /dev/null > +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb > @@ -0,0 +1,60 @@ > +SUMMARY = "Open Source multimedia player" > +SECTION = "multimedia" > +HOMEPAGE = "http://www.mpv.io/; > +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv libxscrnsaver" > + > +# Depends on xsp, libxv, virtual/libx11, libxscrnsaver > +REQUIRED_DISTRO_FEATURES = "x11" > + > +LICENSE = "GPLv2+" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" > + > +SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ > + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \ > +" > +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101" > +SRC_URI[mpv.sha256sum] = > "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc" > +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" > +SRC_URI[waf.sha256sum] = > "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" > + > +EXTRA_OECONF = " \ > +--prefix=${D}/usr \ why not ${prefix} and does it really need to be prefixed with ${D} (unlike mandir bellow)? Ugly waf. > +--mandir=${mandir} \ > +--target=${SIMPLE_TARGET_SYS} \ > +--disable-gl \ > +--disable-libsmbclient \ > +--disable-libass \ > +--disable-lua \ > +--disable-libass-osd \ > +--disable-encoding \ > +--disable-libbluray \ > +--disable-dvdread \ > +--disable-dvdnav \ > +--disable-cdda \ > +--disable-enca \ > +--disable-libguess \ > +--disable-uchardet \ > +--disable-rubberband \ > +--disable-lcms2 \ > +--disable-vapoursynth \ > +--disable-vapoursynth-lazy \ > +--enable-libarchive \ > +" > + > +do_configure() { > +if [ ! -L ../waf ]; then > +chmod a+x ../waf-1.8.12 > + ln -s waf-1.8.12 ../waf > +fi > +../waf configure ${EXTRA_OECONF} > +} > + > +do_compile () { > +../waf build > +} > + > +do_install() { > +../waf install > +} > + > +FILES_${PN} += "/usr/" ${prefix}? Does it install files in strange directories not covered by standard FILES? -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][jethro][PATCH][V2] python-m2crypto: fix SSLv2 symbol issue
On Wed, Mar 09, 2016 at 09:06:57AM -0800, Armin Kuster wrote: > From: Armin Kuster> > missed using "-D" for OPENSSL_NO_SSL2 swig_features. fido version: http://patchwork.openembedded.org/patch/117291/ needed -D as well, right? I've pushed both to fido-next and jethro-next > > ERROR: Failed to import the "M2Crypto" module: > .../usr/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined symbol: > SSLv2_method > > disable using SSLv2_method if not supported in openssl. This is now the case > with the advent of CVE-2016-0800 > > Signed-off-by: Armin Kuster > --- > ...y_build_with_SSLv2_when_it_is_not_available.patch | 20 > > .../python/python-m2crypto_0.21.1.bb | 4 +++- > 2 files changed, 23 insertions(+), 1 deletion(-) > create mode 100644 > meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > > diff --git > a/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > > b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > new file mode 100644 > index 000..526c23f > --- /dev/null > +++ > b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > @@ -0,0 +1,20 @@ > +Upstream-Status: Backport > +https://gitlab.com/m2crypto/m2crypto/commit/ac01b38302474920288c1a9eb63fd35fa8d1db5b > + > +Signed-off-by: Armin Kuster > + > +Index: M2Crypto-0.21.1/SWIG/_ssl.i > +=== > +--- M2Crypto-0.21.1.orig/SWIG/_ssl.i > M2Crypto-0.21.1/SWIG/_ssl.i > +@@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string > + %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long; > + extern const char *SSL_alert_desc_string_long(int); > + > ++#ifndef OPENSSL_NO_SSL2 > + %rename(sslv2_method) SSLv2_method; > + extern SSL_METHOD *SSLv2_method(void); > ++#endif > + %rename(sslv3_method) SSLv3_method; > + extern SSL_METHOD *SSLv3_method(void); > + %rename(sslv23_method) SSLv23_method; > diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > index ff6203f..9daea5e 100644 > --- a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = > "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" > > SRC_URI = > "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ > > file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ > - file://0001-M2Crypto-Error-fix.patch" > + file://0001-M2Crypto-Error-fix.patch \ > + file://dont_try_build_with_SSLv2_when_it_is_not_available.patch" > > SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" > SRC_URI[sha256sum] = > "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" > @@ -19,6 +20,7 @@ inherit setuptools > > SWIG_FEATURES_x86-64 = "-D__x86_64__" > SWIG_FEATURES ?= "" > +SWIG_FEATURES += "-DOPENSSL_NO_SSL2" > export SWIG_FEATURES > > # Get around a problem with swig, but only if the > -- > 2.3.5 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-oe] crash: add native package
On Wed, Mar 09, 2016 at 03:48:43PM +0800, kai.k...@windriver.com wrote: > From: Kai Kang> > Add crash-native package. > > * append EXTRA_OEMAKE option to find ncurses library > * pass right install DESTDIR > > Signed-off-by: Kai Kang > --- > meta-oe/recipes-kernel/crash/crash_7.1.3.bb | 17 ++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/meta-oe/recipes-kernel/crash/crash_7.1.3.bb > b/meta-oe/recipes-kernel/crash/crash_7.1.3.bb > index f6934f7..e085094 100644 > --- a/meta-oe/recipes-kernel/crash/crash_7.1.3.bb > +++ b/meta-oe/recipes-kernel/crash/crash_7.1.3.bb > @@ -32,6 +32,8 @@ SRC_URI[gdb.sha256sum] = > "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5 > > inherit gettext > > +BBCLASSEXTEND = "native" > + > # crash 7.1.3 and before don't support mips64 > COMPATIBLE_HOST = "^(?!mips64).*" > > @@ -40,6 +42,7 @@ EXTRA_OEMAKE = 'RPMPKG="${PV}" \ > GDB_HOST="${BUILD_SYS}" \ > GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ > ' > +EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'" > > do_configure() { > : > @@ -65,17 +68,25 @@ do_compile() { > oe_runmake ${EXTRA_OEMAKE} > } > > -do_install () { > +do_install_prepend () { > install -d ${D}${bindir} > install -d ${D}/${mandir}/man8 > install -d ${D}${includedir}/crash > > -oe_runmake DESTDIR=${D} install > install -m 0644 ${S}/crash.8 ${D}/${mandir}/man8/ > install -m 0644 ${S}/defs.h ${D}${includedir}/crash > -} > +} > + > +do_install_class-target () { > +oe_runmake DESTDIR=${D} install > +} > + > +do_install_class-native () { > +oe_runmake DESTDIR=${D}${STAGING_DIR_NATIVE} install > +} > > RDEPENDS_${PN} += "liblzma" > +RDEPENDS_${PN}_class-native += "xz-native" Why is this needed? native builds aren't creating any packages. > # Causes gcc to get stuck and eat all available memory in qemuarm builds > # jenkins 15161 100 12.5 10389596 10321284 ? R11:40 28:17 > /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.2/cc1 > -quiet -I . -I . -I ./common -I ./config -I ./../include/opcode -I > ./../opcodes/.. -I ./../readline/.. -I ../bfd -I ./../bfd -I ./../include -I > ../libdecnumber -I ./../libdecnumber -I ./gnulib/import -I > build-gnulib/import -isysroot > /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -MMD eval.d -MF > .deps/eval.Tpo -MP -MT eval.o -D LOCALEDIR="/usr/local/share/locale" -D > CRASH_MERGE -D HAVE_CONFIG_H -D TUI=1 eval.c -quiet -dumpbase eval.c > -march=armv5te -mthumb -mthumb-interwork -mtls-dialect=gnu -auxbase-strip > eval.o -g -O2 -Wall -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign > -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts > -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body > -feliminate-unused-debug-types -o - > -- > 2.6.1 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH v3 1/3] nginx: split parts out of the recipe into nginx.inc
On Wed, Mar 09, 2016 at 01:33:56PM +0100, Pascal Bach wrote: > nginx has two maintained branches. > - stable: is the long term maintained branch where only bugfixes occur > - mainline: is the branch where new features get added Still missing SOB lines in all 3 changes. > > This change is in preparation to support these two branches. > --- > meta-webserver/recipes-httpd/nginx/nginx.inc | 137 > + > meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 137 > + > 2 files changed, 139 insertions(+), 135 deletions(-) > create mode 100644 meta-webserver/recipes-httpd/nginx/nginx.inc > > diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc > b/meta-webserver/recipes-httpd/nginx/nginx.inc > new file mode 100644 > index 000..53e3235 > --- /dev/null > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc > @@ -0,0 +1,137 @@ > +SUMMARY = "HTTP and reverse proxy server" > + > +DESCRIPTION = "Nginx is a web server and a reverse proxy server for \ > +HTTP, SMTP, POP3 and IMAP protocols, with a strong focus on high \ > +concurrency, performance and low memory usage." > + > +HOMEPAGE = "http://nginx.org/; > +LICENSE = "BSD-2-Clause" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" > +SECTION = "net" > + > +DEPENDS = "libpcre gzip openssl" > + > +SRC_URI = " \ > + http://nginx.org/download/nginx-${PV}.tar.gz \ > + file://nginx-cross.patch \ > + file://nginx.conf \ > + file://nginx.init \ > + file://nginx-volatile.conf \ > + file://nginx.service \ > +" > + > +inherit update-rc.d useradd > + > +CFLAGS_append = " -fPIE -pie" > +CXXFLAGS_append = " -fPIE -pie" > + > +NGINX_WWWDIR ?= "${localstatedir}/www/localhost" > +NGINX_USER ?= "www" > + > +EXTRA_OECONF = "" > +DISABLE_STATIC = "" > + > +do_configure () { > + if [ "${SITEINFO_BITS}" = "64" ]; then > + PTRSIZE=8 > + else > + PTRSIZE=4 > + fi > + > + echo $CFLAGS > + echo $LDFLAGS > + > + ./configure \ > + --crossbuild=Linux:${TUNE_ARCH} \ > + --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', > 'little', 'big', d)} \ > + --with-int=4 \ > + --with-long=${PTRSIZE} \ > + --with-long-long=8 \ > + --with-ptr-size=${PTRSIZE} \ > + --with-sig-atomic-t=${PTRSIZE} \ > + --with-size-t=${PTRSIZE} \ > + --with-off-t=${PTRSIZE} \ > + --with-time-t=${PTRSIZE} \ > + --with-sys-nerr=132 \ > + --conf-path=${sysconfdir}/nginx/nginx.conf \ > + --http-log-path=${localstatedir}/log/nginx/access.log \ > + --error-log-path=${localstatedir}/log/nginx/error.log \ > + --pid-path=/run/nginx/nginx.pid \ > + --prefix=${prefix} \ > + --with-http_ssl_module \ > + --with-http_gzip_static_module \ > + ${EXTRA_OECONF} > +} > + > +do_install () { > + oe_runmake 'DESTDIR=${D}' install > + rm -fr ${D}${localstatedir}/run ${D}/run > + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; > then > + install -d ${D}${sysconfdir}/tmpfiles.d > + echo "d /run/${BPN} - - - -" \ > + > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf > + fi > + install -d ${D}${sysconfdir}/${BPN} > + ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run > + install -d ${D}${NGINX_WWWDIR} > + mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ > + chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} > + > + install -d ${D}${sysconfdir}/init.d > + install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx > + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx > + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx > + > + install -d ${D}${sysconfdir}/nginx > + install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf > + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf > + install -d ${D}${sysconfdir}/nginx/sites-enabled > + > + install -d ${D}${sysconfdir}/default/volatiles > + install -m 0644 ${WORKDIR}/nginx-volatile.conf > ${D}${sysconfdir}/default/volatiles/99_nginx > + sed -i 's,/var/,${localstatedir}/,g' > ${D}${sysconfdir}/default/volatiles/99_nginx > + > +if > ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then > +install -d ${D}${systemd_unitdir}/system > +install -m 0644 ${WORKDIR}/nginx.service > ${D}${systemd_unitdir}/system/ > +sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ > +-e 's,@LOCALSTATEDIR@,${localstatedir},g' \ > +-e 's,@BASEBINDIR@,${base_bindir},g' \ > +${D}${systemd_unitdir}/system/nginx.service > +fi > +} > + > +pkg_postinst_${PN} () { > + if [ -z "$D" ]; then > + if type systemd-tmpfiles >/dev/null; then > + systemd-tmpfiles --create > + elif [ -e
[oe] [meta-python][jethro][PATCH][V2] python-m2crypto: fix SSLv2 symbol issue
From: Armin Kustermissed using "-D" for OPENSSL_NO_SSL2 swig_features. ERROR: Failed to import the "M2Crypto" module: .../usr/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined symbol: SSLv2_method disable using SSLv2_method if not supported in openssl. This is now the case with the advent of CVE-2016-0800 Signed-off-by: Armin Kuster --- ...y_build_with_SSLv2_when_it_is_not_available.patch | 20 .../python/python-m2crypto_0.21.1.bb | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch diff --git a/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch new file mode 100644 index 000..526c23f --- /dev/null +++ b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch @@ -0,0 +1,20 @@ +Upstream-Status: Backport +https://gitlab.com/m2crypto/m2crypto/commit/ac01b38302474920288c1a9eb63fd35fa8d1db5b + +Signed-off-by: Armin Kuster + +Index: M2Crypto-0.21.1/SWIG/_ssl.i +=== +--- M2Crypto-0.21.1.orig/SWIG/_ssl.i M2Crypto-0.21.1/SWIG/_ssl.i +@@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string + %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long; + extern const char *SSL_alert_desc_string_long(int); + ++#ifndef OPENSSL_NO_SSL2 + %rename(sslv2_method) SSLv2_method; + extern SSL_METHOD *SSLv2_method(void); ++#endif + %rename(sslv3_method) SSLv3_method; + extern SSL_METHOD *SSLv3_method(void); + %rename(sslv23_method) SSLv23_method; diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb index ff6203f..9daea5e 100644 --- a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ - file://0001-M2Crypto-Error-fix.patch" + file://0001-M2Crypto-Error-fix.patch \ + file://dont_try_build_with_SSLv2_when_it_is_not_available.patch" SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" @@ -19,6 +20,7 @@ inherit setuptools SWIG_FEATURES_x86-64 = "-D__x86_64__" SWIG_FEATURES ?= "" +SWIG_FEATURES += "-DOPENSSL_NO_SSL2" export SWIG_FEATURES # Get around a problem with swig, but only if the -- 2.3.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 24/38] libunique: fix gobject introspection support
Signed-off-by: Alexander Kanavin--- ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch | 27 ++ meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 6 +++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch new file mode 100644 index 000..2b5eda0 --- /dev/null +++ b/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch @@ -0,0 +1,27 @@ +From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 18 Feb 2016 17:40:45 +0200 +Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + unique/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unique/Makefile.am b/unique/Makefile.am +index 6475a87..734f431 100644 +--- a/unique/Makefile.am b/unique/Makefile.am +@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la + --include=GObject-2.0 \ + --include=Gtk-2.0 \ + --library=libunique-1.0.la \ +- --libtool="$(top_builddir)/libtool" \ ++ --libtool="$(LIBTOOL)" \ + --pkg gobject-2.0 \ + --pkg gtk+-2.0 \ + --output $@ \ +-- +2.7.0 + diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb index d97d1d6..3d13e5a 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb @@ -6,7 +6,9 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique; SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ file://fix_for_compile_with_gcc-4.6.0.patch \ file://noconst.patch \ -file://build.patch" +file://build.patch \ +file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ +" SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" @@ -22,4 +24,4 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit autotools pkgconfig +inherit autotools pkgconfig gobject-introspection -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 04/38] gnome-desktop: remove pygtk dependency
pygtk is no longer provided in oe-core as it's obsolete and incompatible with pygobject 3.x Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb index 4fedbe6..703c397 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb @@ -14,7 +14,7 @@ GNOME_COMPRESS_TYPE="bz2" DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification" -EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" +EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about" do_configure_prepend () { sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in @@ -23,7 +23,3 @@ do_configure_prepend () { PACKAGES =+ "libgnome-desktop" FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop/pnp.ids" FILES_${PN} += "${datadir}/gnome-about" - -# for gnome-about -RRECOMMENDS_${PN} += "python-pygtk python-pycairo" - -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 38/38] gnome-panel: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb index 47c8b80..23e2de8 100644 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb @@ -14,7 +14,7 @@ DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ \ librsvg libcanberra" RDEPENDS_${PN} = "python" -inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf +inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-introspection SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590" SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \ -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 32/38] python-dbusmock: use real introspection instead on legacy pygobject
The patch that switches to pygobject can be now dropped, because real introspection is provided in oe-core. Signed-off-by: Alexander Kanavin--- ...-t-use-gobject-introspection-for-bindings.patch | 29 -- .../python/python-dbusmock_0.10.1.bb | 1 - 2 files changed, 30 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch b/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch deleted file mode 100644 index f3ab53c..000 --- a/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 29960f2fce7ab42ed0a1bf8ce96499fdb6eedf3c Mon Sep 17 00:00:00 2001 -From: Simon Busch -Date: Tue, 25 Mar 2014 15:28:54 +0100 -Subject: [PATCH] Don't use gobject introspection for bindings - -In our environment we're not providing the glib python bindings through -introspection but just pygobject so we need to use the right import. - -Signed-off-by: Simon Busch - dbusmock/__main__.py |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbusmock/__main__.py b/dbusmock/__main__.py -index 44b63fb..bfd089c 100644 a/dbusmock/__main__.py -+++ b/dbusmock/__main__.py -@@ -51,7 +51,7 @@ def parse_args(): - - if __name__ == '__main__': - import dbus.mainloop.glib --from gi.repository import GLib -+import glib as GLib - - args = parse_args() - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) --- -1.7.9.5 - diff --git a/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb b/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb index b247943..2520bfc 100644 --- a/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb +++ b/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb @@ -14,7 +14,6 @@ SRC_URI[md5sum] = "7370d325c4a75494dd71885ca65b79e8" SRC_URI[sha256sum] = "03aadc93bdc26ea18d4d78fcff7b6cb34f4e18623bc5cc41cf9539d663cee11e" SRC_URI += " \ -file://0001-Don-t-use-gobject-introspection-for-bindings.patch \ file://0001-Add-functionality-to-add-own-objects-to-internal-obj.patch \ file://0002-Add-possibility-to-import-templates-from-packages.patch \ " -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 33/38] gnome-menus: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb | 2 +- meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index 611499a..bf55197 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb @@ -9,7 +9,7 @@ PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menu DEPENDS = "python libxml2 gconf popt gtk+3" -inherit gnomebase pkgconfig python-dir pythonnative +inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection BPN = "gnome-menus" diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb index 5e1588e..1b84a54 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb @@ -7,7 +7,7 @@ PR = "r1" DEPENDS = "python libxml2 gconf popt gtk+" -inherit gnomebase pkgconfig python-dir pythonnative +inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624" SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 27/38] gimp: accept newer versins of babl and gegl
Add a patch that makes gimp accept new versions of babl and gegl, taken from Debian. Signed-off-by: Alexander Kanavin--- .../gimp/gimp/bump_Babl-GEGL_versions.patch| 53 ++ meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch diff --git a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch new file mode 100644 index 000..b71bf32 --- /dev/null +++ b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch @@ -0,0 +1,53 @@ +Bump acceptable versions of babl and gegl. + +Patch is taken from debian: +https://packages.debian.org/stretch/gimp + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Alexander Kanavin +diff --git a/app/sanity.c b/app/sanity.c +index febddfb..85fea55 100644 +--- a/app/sanity.c b/app/sanity.c +@@ -351,7 +351,7 @@ sanity_check_babl (void) + + #define BABL_REQUIRED_MAJOR 0 + #define BABL_REQUIRED_MINOR 1 +-#define BABL_REQUIRED_MICRO 10 ++#define BABL_REQUIRED_MICRO 12 + + babl_get_version (_major_version, + _minor_version, +@@ -388,7 +388,7 @@ sanity_check_gegl (void) + gint gegl_micro_version; + + #define GEGL_REQUIRED_MAJOR 0 +-#define GEGL_REQUIRED_MINOR 2 ++#define GEGL_REQUIRED_MINOR 3 + #define GEGL_REQUIRED_MICRO 0 + + gegl_get_version (_major_version, +diff --git a/configure.ac b/configure.ac +index 26812b6..4252fe9 100644 +--- a/configure.ac b/configure.ac +@@ -40,8 +40,8 @@ m4_define([gimp_stable], + m4_define([gimp_full_name], [GNU Image Manipulation Program]) + + # required versions of other packages +-m4_define([babl_required_version], [0.1.10]) +-m4_define([gegl_required_version], [0.2.0]) ++m4_define([babl_required_version], [0.1.12]) ++m4_define([gegl_required_version], [0.3.0]) + m4_define([glib_required_version], [2.30.2]) + m4_define([atk_required_version], [2.2.0]) + m4_define([gtk_required_version], [2.24.10]) +@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR) + ### + + PKG_CHECK_MODULES(BABL, babl >= babl_required_version) +-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version) ++PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) + PKG_CHECK_MODULES(ATK, atk >= atk_required_version) + + AM_PATH_GLIB_2_0(glib_required_version, :, diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb index 1522fd6..a647911 100644 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb @@ -12,6 +12,7 @@ inherit gnome gtk-doc SRC_URI = " \ http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ file://0001-configure-ac-do-not-check-for-freetype-config.patch \ +file://bump_Babl-GEGL_versions.patch \ " SRC_URI[md5sum] = "233c948203383fa078434cc3f8f925cb" SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 37/38] network-manager-applet: fix gobject introspection
Signed-off-by: Alexander Kanavin--- .../network-manager-applet/network-manager-applet_1.0.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb index 33662d3..d3e08ca 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib gconf libgnome-keyring iso-codes nss" -inherit gnomebase gsettings gtk-icon-cache +inherit gnomebase gsettings gtk-icon-cache gobject-introspection GNOME_COMPRESS_TYPE = "xz" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 31/38] upower: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-support/upower/upower_0.9.14.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb index 8cf8e43..dddaa9b 100644 --- a/meta-oe/recipes-support/upower/upower_0.9.14.bb +++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" PR = "r2" -DEPENDS = "libusb1 libgudev glib-2.0 dbus-glib polkit gobject-introspection-stub" +DEPENDS = "libusb1 libgudev glib-2.0 dbus-glib polkit" SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz; SRC_URI[md5sum] = "18803f82102d56aac90949d1e4251645" SRC_URI[sha256sum] = "81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf874a4c5" -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext gobject-introspection PACKAGECONFIG ??= "" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 25/38] babl: update to 0.1.16
This fixes gobject introspection support. Signed-off-by: Alexander Kanavin--- meta-oe/recipes-graphics/babl/{babl_0.1.10.bb => babl_0.1.16.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-graphics/babl/{babl_0.1.10.bb => babl_0.1.16.bb} (72%) diff --git a/meta-oe/recipes-graphics/babl/babl_0.1.10.bb b/meta-oe/recipes-graphics/babl/babl_0.1.16.bb similarity index 72% rename from meta-oe/recipes-graphics/babl/babl_0.1.10.bb rename to meta-oe/recipes-graphics/babl/babl_0.1.16.bb index 4892021..daea052 100644 --- a/meta-oe/recipes-graphics/babl/babl_0.1.10.bb +++ b/meta-oe/recipes-graphics/babl/babl_0.1.16.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" inherit gnomebase SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.1/${BP}.tar.bz2; -SRC_URI[md5sum] = "9e1542ab5c0b12ea3af076a9a2f02d79" -SRC_URI[sha256sum] = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4" +SRC_URI[md5sum] = "a1c72e5f5d55a8b736ef2fa67ddb86ec" +SRC_URI[sha256sum] = "7d6ba55ec53ee6f6bf6945beec28839d09ff72376f4d83035eb379cd4f3e980e" FILES_${PN} += "${libdir}/babl-*/*.so" FILES_${PN}-dev += "${libdir}/babl-*/*.la" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 29/38] poppler: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-support/poppler/poppler_0.37.0.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb b/meta-oe/recipes-support/poppler/poppler_0.37.0.bb index 59c477d..2c6b1a9 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.37.0.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a DEPENDS = "fontconfig zlib cairo lcms" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc gobject-introspection PACKAGECONFIG ??= "jpeg openjpeg png tiff ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg" @@ -28,6 +28,10 @@ EXTRA_OECONF = "\ --enable-zlib \ " +do_compile_prepend() { +export GIR_EXTRA_LIBS_PATH="${B}/poppler/.libs" +} + # Adjust library names when building for QT4e QT4E_PATCHES = "${@bb.utils.contains('PACKAGECONFIG', 'qt4e', 'file://fix-qt4e-library-dependencies.patch', '', d)}" SRC_URI_append = "${QT4E_PATCHES}" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 35/38] libgtop: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb index 8568274..d79b9e5 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb @@ -2,7 +2,7 @@ SUMMARY = "LibGTop2" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://copyright.txt;md5=dbc839bf158d19a20e661db14db7a58c" -inherit gnomebase lib_package gtk-doc distro_features_check +inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspection # depends on libxau REQUIRED_DISTRO_FEATURES = "x11" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 26/38] gegl: update to 0.3.4
This fixes gobject introspection support. Signed-off-by: Alexander Kanavin--- .../gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb} | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) rename meta-oe/recipes-graphics/gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb} (45%) diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb b/meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb similarity index 45% rename from meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb rename to meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb index bd2e5d4..15c1b64 100644 --- a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb +++ b/meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb @@ -1,24 +1,28 @@ SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl" +DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl json-glib" -inherit gnome +EXTRA_OECONF = "--disable-docs" -EXTRA_OECONF = "--disable-docs " +inherit gnomebase vala gobject-introspection PACKAGECONFIG ??= "" PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav" +PACKAGECONFIG[lcms] = "--with-lcms,--without-lcms,lcms" +PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" +PACKAGECONFIG[webp] = "--with-webp,--without-webp,webp" -SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.2/${BP}.tar.bz2 \ +SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.3/${BP}.tar.bz2 \ file://pkgconfig.patch " -SRC_URI[md5sum] = "32b2f1f1e316115c4ed922e1dec8" -SRC_URI[sha256sum] = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426" +SRC_URI[md5sum] = "c19478321594d715a4cb324a0decda6f" +SRC_URI[sha256sum] = "846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec" -FILES_${PN} += "${libdir}/gegl-*/*.so" -FILES_${PN}-dev += "${libdir}/gegl-*/*.la" -FILES_${PN}-dbg += "${libdir}/gegl-*/.debug" +# There are a couple of non-symlink .so files installed into libdir, which need to go into main package +FILES_${PN}_append = " ${libdir}/gegl-0.3/*.so ${libdir}/gegl-0.3/*.json ${libdir}/libgegl-npd-0.3.so ${libdir}/libgegl-sc-0.3.so" +FILES_${PN}-dev_append = " ${libdir}/gegl-0.3/*.la ${libdir}/libgegl-0.3.so" +FILES_${PN}-dev_remove = "${libdir}/lib*.so" # Fails to build with thumb-1 (qemuarm) # gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 36/38] nautilus: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb index 9728d52..d29385e 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb @@ -11,7 +11,7 @@ PR = "r6" DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native" # optional: tracker -inherit gnome +inherit gnome gobject-introspection SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911" SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 34/38] libgdata: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb index b27420a..2a6f04b 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" -inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala +inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala gobject-introspection do_configure_prepend_class-target () { # introspection.m4 pre-packaged with upstream tarballs does not yet -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 28/38] omgps: remove the recipe
The project is dead upstream, and relies on pygobject 2.x which has been replaced by 3.x in oe.core. Signed-off-by: Alexander Kanavin--- ...g_type_init-is-deprecated-for-glib-2.35.0.patch | 33 -- .../omgps/omgps/fix.build.with.gcc.4.9.patch | 22 .../omgps/omgps/fix.build.with.glib.2.34.patch | 125 - .../omgps/omgps/fix.capability.patch | 62 -- .../recipes-navigation/omgps/omgps/gcc-4.4.patch | 71 .../omgps/omgps/gdk-pixbuf-2.26.5.patch| 15 --- .../omgps/omgps/sysfs.node.2.6.32.patch| 14 --- .../omgps/omgps/use.unused.variable.patch | 15 --- meta-oe/recipes-navigation/omgps/omgps_svn.bb | 29 - 9 files changed, 386 deletions(-) delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch delete mode 100644 meta-oe/recipes-navigation/omgps/omgps_svn.bb diff --git a/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch b/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch deleted file mode 100644 index 6b9f465..000 --- a/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 22bcf06637d64e40af6c152e28b31eef41e3f583 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Jun 2013 02:35:22 -0700 -Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0 - -Call it for old versions. - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - src/main.c |4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main.c b/src/main.c -index e984da4..a63ddf3 100644 a/src/main.c -+++ b/src/main.c -@@ -486,9 +486,9 @@ int main(int argc, char **argv) - if (strcmp(argv[1], "-log2file") == 0) - log2console = FALSE; - } -- -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init(); -- -+#endif - gdk_threads_init(); - - gdk_threads_enter(); --- -1.7.9.5 - diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch deleted file mode 100644 index 1680bc0..000 --- a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch +++ /dev/null @@ -1,22 +0,0 @@ -omgps: omgps fails compilation due to uninitialized variables - -omgps does not compile with gcc 4.9 due to uninitialized variables -with the option -Werror=maybe-uninitialized -To solve the problem, just initiated the variable and checked for side -effects. -Upstream-Status: Submitted -+https://code.google.com/p/omgps/issues/detail?id=16 - -Signed-off-by: Raphael Silva -diff -urpN omgps.orig/src/sound.c omgps/src/sound.c omgps.orig/src/sound.c 2014-12-14 15:13:29.609243994 -0200 -+++ omgps/src/sound.c 2014-12-14 15:14:13.831116745 -0200 -@@ -44,7 +44,7 @@ static gboolean play_sound_files(char *f - return FALSE; - - char *bak = strdup(files); -- char *saveptr; -+ char *saveptr = NULL; - char *p = strtok_r(bak, ";", ); - - #define MAX_SOUND_FILES 14 diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch deleted file mode 100644 index ec3bde0..000 --- a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch +++ /dev/null @@ -1,125 +0,0 @@ -Upstream-Status: Submitted -https://code.google.com/p/omgps/issues/detail?id=15 - -diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c omgps.orig/src/dbus_intf.c 2011-12-12 12:22:47.0 +0100 -+++ omgps/src/dbus_intf.c 2012-11-14 14:44:45.435381443 +0100 -@@ -171,7 +171,7 @@ - gpsdata->svinfo_valid = TRUE; - - int i, j; -- GValueArray *val; -+ GArray *val; - svinfo_channel_t *sv; - - j = 0; -@@ -179,16 +179,16 @@ - val = satellites->pdata[i]; - - sv = >sv_channels[j]; -- sv->sv_id = g_value_get_uint(g_value_array_get_nth(val, 0)); -+ sv->sv_id = g_array_index(val, guint, 0); - -- if (g_value_get_boolean(g_value_array_get_nth(val, 1)))
[oe] [PATCH 30/38] udisks2: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-support/udisks/udisks2_2.1.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb index 031b0e8..d273948 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb @@ -11,11 +11,11 @@ SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2; SRC_URI[md5sum] = "73632501002e6de8244f831e38b2b98e" SRC_URI[sha256sum] = "2cfcf560447ea44cba2a683342c7062aaaf35e4eb554bed64ac2dd55a70a5fb6" -inherit autotools systemd gtk-doc +inherit autotools systemd gtk-doc gobject-introspection S = "${WORKDIR}/udisks-${PV}" -EXTRA_OECONF = "--disable-introspection --disable-man" +EXTRA_OECONF = "--disable-man" FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ ${datadir}/dbus-1/ \ -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 23/38] gtkextra: fix gobject introspection support
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb b/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb index 8ce6e94..926eff7 100644 --- a/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb +++ b/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb @@ -11,9 +11,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gtkextra/${BP}.tar.gz \ SRC_URI[md5sum] = "486cea93666020f85f101ed8341baf41" SRC_URI[sha256sum] = "9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65" -DEPENDS = "gtk+ gobject-introspection-stub" +DEPENDS = "gtk+" -inherit autotools pkgconfig +inherit autotools pkgconfig gobject-introspection # | ./.libs/libgtkextra-x11-3.0.so: error: undefined reference to 'roundint' PNBLACKLIST[gtkextra] ?= "BROKEN: Fails to build with gcc-5" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 18/38] modemmanager: fix vala support
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb index f251270..a173e69 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -inherit gnomebase gettext systemd +inherit gnomebase gettext systemd vala gobject-introspection DEPENDS = "glib-2.0 libgudev dbus-glib" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 16/38] libmediaart: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-multimedia/recipes-support/libmediaart/libmediaart.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc index a117e9b..57dca9c 100644 --- a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc +++ b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc @@ -9,6 +9,6 @@ DEPENDS = "glib-2.0 gdk-pixbuf" GNOME_COMPRESS_TYPE = "xz" -inherit gnomebase gtk-doc +inherit gnomebase gtk-doc gobject-introspection -EXTRA_OECONF = "--disable-introspection --disable-qt --enable-gdkpixbuf" +EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 20/38] telepathy-glib: fix gobject introspection support
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb index e6938f1..01c6e37 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa02 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext gobject-introspection FILES_${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 21/38] libgee: fix gobject introspection support
Signed-off-by: Alexander Kanavin--- meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb b/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb index 0a2a052..bf9705c 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures." HOMEPAGE = "http://live.gnome.org/Libgee; SECTION = "libs" -DEPENDS = "glib-2.0 gobject-introspection-stub" +DEPENDS = "glib-2.0" BBCLASSEXTEND = "native" LICENSE = "LGPLv2.1" @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PE = "1" -inherit autotools vala pkgconfig +inherit autotools vala pkgconfig gobject-introspection do_configure_prepend() { MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" for i in ${MACROS}; do -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 17/38] bluez4: use real introspection instead of legacy pygobject
Now that the real introspection is available, and legacy pygobject is not, the patch to use the latter should be removed. Signed-off-by: Alexander Kanavin--- ...pygobject-instead-ofgobject-introspection.patch | 27 -- meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch deleted file mode 100644 index 37037f5..000 --- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate - -use legacy pygobject instead of gobject-introspection - -Signed-off-by: Zhong Hongbo -diff -Nurd bluez-4.101.orig/test/simple-agent bluez-4.101/test/simple-agent bluez-4.101.orig/test/simple-agent 2013-11-13 17:14:08.138118159 +0800 -+++ bluez-4.101/test/simple-agent 2013-11-13 17:14:29.034118107 +0800 -@@ -2,7 +2,7 @@ - - from __future__ import absolute_import, print_function, unicode_literals - --from gi.repository import GObject -+import gobject - - import sys - import dbus -@@ -122,7 +122,7 @@ - path = "/test/agent" - agent = Agent(bus, path) - -- mainloop = GObject.MainLoop() -+ mainloop = gobject.MainLoop() - - if len(args) > 1: - if len(args) > 2: diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb index 7719d05..d6d16c0 100644 --- a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb +++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb @@ -10,7 +10,6 @@ SRC_URI += "file://bluetooth.conf \ file://obsolete_automake_macros.patch \ file://network-fix-network-Connect-method-parameters.patch \ file://install-test-script.patch \ -file://use-legacy-pygobject-instead-ofgobject-introspection.patch \ file://fix_encrypt_collision.patch \ " -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 15/38] gstreamer-0.10: disable gobject introspection
Making it work would require significant patching - if you need it, update your stack to gstreamer 1.x Signed-off-by: Alexander Kanavin--- meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc | 2 +- meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb | 2 ++ meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc index 123df42..dec6920 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc @@ -9,7 +9,7 @@ inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2; GSTREAMER_DEBUG ?= "--disable-debug" -EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples " +EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples --disable-introspection" acpaths = "-I ${S}/common/m4 -I ${S}/m4" diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb index 9318656..b78bcaf 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb @@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "9915887cf8515bda87462c69738646afb715b597613edc7340477ccab6 DEPENDS = "gst-plugins-base gstreamer" +EXTRA_OECONF = "--disable-introspection" + # Configure always checks for Python so inherit pythonnative. Better solution # would be to disable the checks entirely. inherit autotools pythonnative gettext diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb index 5b30603..3444511 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb @@ -28,6 +28,7 @@ EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \ --disable-dependency-tracking --disable-check \ --disable-examples --disable-tests \ --disable-valgrind ${GSTREAMER_DEBUG} \ +--disable-introspection \ " CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 10/38] tracker: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-support/tracker/tracker_0.14.2.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb index 41501df..c52d95e 100644 --- a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +++ b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb @@ -8,11 +8,10 @@ HOMEPAGE = "http://projects.gnome.org/tracker/; PR = "r7" -inherit autotools pkgconfig gnomebase gettext gsettings systemd +inherit autotools pkgconfig gnomebase gettext gsettings systemd gobject-introspection VER_DIR = "${@gnome_verdir("${PV}")}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ - file://0005-Fix-missing-gobject-introspection-checks.patch \ file://enable-sqlite-crosscompile.patch \ file://fix-removable-media-detection.patch \ file://90tracker \ @@ -35,6 +34,10 @@ EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ LEAD_SONAME = "libtrackerclient.so.0" +do_compile_prepend() { +export GIR_EXTRA_LIBS_PATH="${B}/src/libtracker-sparql-backend/.libs:${B}/src/libtracker-data/.libs:${B}/src/libtracker-common/.libs" +} + do_install_append() { cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true # install -d ${D}/${sysconfdir}/X11/Xsession.d/ -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 09/38] goffice: fix gobject introspection
Signed-off-by: Alexander Kanavin--- ...igure.ac-fix-paths-to-introspection-tools.patch | 41 ++ .../recipes-support/goffice/goffice_0.10.1.bb | 4 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch diff --git a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch new file mode 100644 index 000..a645978 --- /dev/null +++ b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch @@ -0,0 +1,41 @@ +From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 19 Feb 2016 16:04:24 +0200 +Subject: [PATCH] configure.ac: fix paths to introspection tools + +They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR + +Signed-off-by: Alexander Kanavin +--- + configure.ac | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6d2b747..3b28463 100644 +--- a/configure.ac b/configure.ac +@@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then +dnl python where to find libgoffice, so you might also need to set +dnl LD_LIBRARY_PATH. + +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +if test "x$INTROSPECTION_GIRDIR" = x; then + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +fi +@@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then +fi +INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + else +INTROSPECTION_SCANNER= +INTROSPECTION_COMPILER= +-- +2.7.0 + diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb index 1e9ec4c..919aa7b 100644 --- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb @@ -5,10 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e" DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool" -inherit gnomebase pkgconfig perlnative +inherit gnomebase pkgconfig perlnative gobject-introspection GNOME_COMPRESS_TYPE = "xz" +SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch" + SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727" SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 07/38] libwnck: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index 3e5370d..c939a49 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -3,12 +3,12 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "x11/libs" -DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native libxres" +DEPENDS = "gtk+ gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -inherit gnomebase +inherit gnomebase gobject-introspection GNOME_COMPRESS_TYPE = "xz" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 13/38] media-service-demo: remove the recipe
It hasn't been updated in years, and depends on pygtk, which is obsolete and incompatible with pygobject 3.x (and so is no longer provided). Signed-off-by: Alexander Kanavin--- .../dleyna/media-service-demo_git.bb | 18 -- 1 file changed, 18 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb diff --git a/meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb b/meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb deleted file mode 100644 index f7457fd..000 --- a/meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "demonstration UI for dleyna" -HOMEPAGE = "https://01.org/dleyna/; - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://src/media-service-demo.py;beginline=3;endline=21;md5=2faa3862e32422b3c38a1501539aa8b4" - -SRCREV = "f4440e104f0d13e454234184c2c6eba982725baf" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://github.com/01org/media-service-demo.git" - -S = "${WORKDIR}/git" - -inherit distutils - -RDEPENDS_${PN} = "media-service-upnp python-dbus python-gst python-pygtk \ - python-crypt python-netclient python-dateutil" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 14/38] python-gst: remove the 0.10 recipe
It depends on pygobject 2.x which has been update to 3.x in oe-core Signed-off-by: Alexander Kanavin--- .../gstreamer-0.10/python-gst/python-path.patch| 28 - .../gstreamer-0.10/python-gst_0.10.22.bb | 29 -- 2 files changed, 57 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch deleted file mode 100644 index 21b5bbf..000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status:Pending - -Index: gst-python-0.10.19/acinclude.m4 -=== gst-python-0.10.19.orig/acinclude.m4 2010-04-21 15:23:44.0 -0700 -+++ gst-python-0.10.19/acinclude.m42010-11-15 14:43:00.642994001 -0800 -@@ -43,6 +43,13 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES -+ -+AC_ARG_WITH(python-includes, -+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) -+if test x$py_exec_prefix != x; then -+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+py_prefix="${py_exec_prefix}" -+else - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` - if $PYTHON-config --help 2>/dev/null; then -@@ -53,6 +60,7 @@ - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi - fi -+fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb deleted file mode 100644 index 2a5f2b3..000 --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Python bindings for the GStreamer multimedia framework" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -DEPENDS = "gstreamer gst-plugins-base python-pygobject" -RDEPENDS_${PN} += "python-pygtk" -PR = "r2" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ - file://python-path.patch" - -SRC_URI[md5sum] = "937152fe896241f827689f4b53e79b22" -SRC_URI[sha256sum] = "8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178" -S = "${WORKDIR}/gst-python-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=39ff67e932b7bdfa9b78bad67151690b" - -inherit autotools distutils-base pkgconfig - -EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" - -FILES_${PN} += "${datadir}/gst-python" -FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/ ${libdir}/gstreamer-0.10/.debug/" - -do_configure_prepend() { - if [ `find ${STAGING_LIBDIR} -name libpython*.so` ]; then - ln -sf ${STAGING_LIBDIR}/libpython*.so `find ${STAGING_LIBDIR} -name libpython*.a -exec dirname {} \;` - fi -} -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 11/38] gupnp: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-multimedia/recipes-connectivity/gupnp/gssdp.inc | 12 +++- meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc | 9 +++-- .../recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb | 4 +--- .../recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb| 6 +++--- meta-multimedia/recipes-connectivity/gupnp/gupnp.inc | 12 +++- meta-multimedia/recipes-connectivity/gupnp/no-vala.inc | 5 - 6 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/no-vala.inc diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc index ae965b9..5a4939c 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc @@ -2,13 +2,15 @@ SUMMARY = "Resource discovery and announcement over SSDP" DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -DEPENDS = "glib-2.0 libsoup-2.4 gobject-introspection-stub" +DEPENDS = "glib-2.0 libsoup-2.4" -inherit autotools pkgconfig +inherit autotools pkgconfig gobject-introspection vala -require no-vala.inc - -EXTRA_OECONF = "--disable-introspection" +# Copy vapigen.m4 so that it doesn't get removed by vala class +# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro) +do_configure_prepend() { +cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true +} PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc index b076155..0544501 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc @@ -3,6 +3,11 @@ DESCRIPTION = "GUPnP-AV is a collection of helpers for building AV (audio/video) LICENSE = "LGPLv2" DEPENDS = "gupnp" -inherit autotools pkgconfig +inherit autotools pkgconfig gobject-introspection vala + +# Copy vapigen.m4 so that it doesn't get removed by vala class +# (normally this would be the right thing to do, but in gupnp-av the vapigen.m4 has only a custom macro) +do_configure_prepend() { +cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true +} -require no-vala.inc diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb index 17ec52f..053604e 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb @@ -9,9 +9,7 @@ SRC_URI = "http://download.gnome.org/sources/${BPN}/0.9/${BPN}-${PV}.tar.xz; SRC_URI[md5sum] = "f93665e535a512e4d515a86311435cb6" SRC_URI[sha256sum] = "69969713f36c0e815fbbbcfdfb3ad9bd447cfd10d0fd86227d82dfd8edb6c807" -inherit autotools pkgconfig - -require no-vala.inc +inherit autotools pkgconfig gobject-introspection vala PACKAGECONFIG ?= "gstreamer" PACKAGECONFIG[gstreamer] = "--enable-gstreamer-metadata-backend,--disable-gstreamer-metadata-backend,gstreamer1.0 gstreamer1.0-plugins-base" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb index 667f7ef..0cc4a3a 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb @@ -3,12 +3,12 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" -DEPENDS = "glib-2.0 gupnp gobject-introspection-stub-native sqlite3" +DEPENDS = "glib-2.0 gupnp sqlite3" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz; SRC_URI[md5sum] = "f881323304185c02634034e3bda714ba" SRC_URI[sha256sum] = "73b6a98a0f13b29b34c3bfc07f99f78b1319211cb95a8585752873af2b9067d3" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc gobject-introspection -EXTRA_OECONF = "--disable-introspection --disable-python" +EXTRA_OECONF = "--disable-python" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc index 28e9b35..6ce9631 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc @@ -2,13 +2,15 @@ SUMMARY = "UPnP framework" DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for creating UPnP devices and control points,
[oe] [PATCH 08/38] libxklavier: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb index 5e1d125..384841a 100644 --- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb @@ -6,13 +6,11 @@ DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" GNOME_COMPRESS_TYPE = "xz" -inherit gnomebase gettext +inherit gnomebase gettext gobject-introspection SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808" SRC_URI[archive.sha256sum] = "ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404" EXTRA_OECONF = "--with-xkb-bin-base=${bindir}" -PACKAGECONFIG ??="" -PACKAGECONFIG[introspection] = "--enable-introspection=yes, --enable-introspection=no, libgirepository" do_configure_append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 12/38] rygel: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb index 663f55e..5cb7d43 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb @@ -17,9 +17,9 @@ GNOME_COMPRESS_TYPE = "xz" SRC_URI[archive.md5sum] = "9fbe4fb53b6cfa2f3f3723b7649a2215" SRC_URI[archive.sha256sum] = "9ea23df7186caac5f1aad3137edf6d507d339b9a469fc3133df4043fa66b61f5" -inherit gnomebase vala +inherit gnomebase vala gobject-introspection -EXTRA_OECONF = "--disable-introspection --disable-tracker-plugin --with-media-engine=gstreamer" +EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer" PACKAGECONFIG ?= "external mpris mediathek ruih media-export gst-launch gtk+3" PACKAGECONFIG[external] = "--enable-external-plugin,--disable-external-plugin" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 05/38] gnumeric: fix gobject introspection support
Signed-off-by: Alexander Kanavin--- ...n-drop-introspection-macros-replace-them-.patch | 84 ++ .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb | 5 +- 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch new file mode 100644 index 000..914d2cc --- /dev/null +++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch @@ -0,0 +1,84 @@ +From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 22 Feb 2016 16:34:03 +0200 +Subject: [PATCH] configure.in: drop introspection macros, replace them with a + standard one + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + configure.in | 57 + + 1 file changed, 1 insertion(+), 56 deletions(-) + +diff --git a/configure.in b/configure.in +index 8e1aa37..3086503 100644 +--- a/configure.in b/configure.in +@@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS) + AC_SUBST(MONO_LIBS) + ]) + +-# GObject Introspection +-GIR_REQ=1.0.0 +-AC_ARG_ENABLE(introspection, +- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], +- [Enable introspection for this build]),, +- [enable_introspection=no]) +- +-AC_MSG_CHECKING([for gobject-introspection]) +- +-dnl presence/version checking +-AS_CASE([$enable_introspection], +-[no], [ +-found_introspection="no (disabled, use --enable-introspection to enable)" +-], +-[yes],[ +-PKG_CHECK_EXISTS([gobject-introspection-1.0],, +- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) +-PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], +- found_introspection=yes, +- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) +-], +-[auto],[ +-PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) +-dnl Canonicalize enable_introspection +-enable_introspection=$found_introspection +-], +-[ +-AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) +-]) ++GOBJECT_INTROSPECTION_CHECK([1.46.0]) + +-AC_MSG_RESULT([$found_introspection]) +- +-INTROSPECTION_SCANNER= +-INTROSPECTION_COMPILER= +-INTROSPECTION_GENERATE= +-INTROSPECTION_GIRDIR= +-INTROSPECTION_TYPELIBDIR= +-if test "x$found_introspection" = "xyes"; then +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +-fi +-AC_SUBST(INTROSPECTION_SCANNER) +-AC_SUBST(INTROSPECTION_COMPILER) +-AC_SUBST(INTROSPECTION_GENERATE) +-AC_SUBST(INTROSPECTION_GIRDIR) +-AC_SUBST(INTROSPECTION_TYPELIBDIR) +-AC_SUBST(INTROSPECTION_CFLAGS) +-AC_SUBST(INTROSPECTION_LIBS) +-AC_SUBST(INTROSPECTION_MAKEFILE) +- +-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") + dnl we need to change the install directories for distcheck + AC_ARG_WITH([gir-dir], + AS_HELP_STRING( +-- +2.7.0 + diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb index 71f99ca..3d3118a 100644 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb +++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb @@ -7,9 +7,10 @@ SUMMARY = "Gnumeric spreadsheet for GNOME" GNOME_COMPRESS_TYPE = "xz" -inherit gnome +inherit gnome pythonnative gobject-introspection -SRC_URI += "file://do-not-use-srcdir.patch" +SRC_URI += "file://do-not-use-srcdir.patch \ + file://0001-configure.in-drop-introspection-macros-replace-them-.patch" SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27" SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111" -- 2.7.0 --
[oe] [PATCH 01/38] evolution-data-server: fix gobject introspection
Signed-off-by: Alexander Kanavin--- meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb index 426076f..a5664b0 100644 --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb @@ -28,7 +28,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -inherit autotools gtk-doc pkgconfig gettext +inherit autotools gtk-doc pkgconfig gettext gobject-introspection # -ldb needs this on some platforms LDFLAGS += "-lpthread" @@ -42,6 +42,10 @@ do_configure_append () { cp ${WORKDIR}/iconv-detect.h ${S} } +do_compile_prepend() { +export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" +} + EXTRA_OECONF = "--without-openldap \ --with-libdb=${STAGING_DIR_HOST}${prefix} \ --disable-nntp --disable-goa --disable-weather" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 02/38] evince: update to 3.18.2
This is done to enable gobject introspection support. Drop obsolete patches. Add a patch that disables yelp m4 macro (which we don't have). Signed-off-by: Alexander Kanavin--- .../evince/0001-help-remove-YELP-macro.patch | 24 +++ .../evince/0001-tiff-fix-compile-warning.patch | 33 ...ove-pkg-config-check-for-gnome-icon-theme.patch | 35 -- .../evince/evince/cross-compile-fix.patch | 25 .../evince/{evince_2.32.0.bb => evince_3.18.2.bb} | 31 ++- 5 files changed, 41 insertions(+), 107 deletions(-) create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch delete mode 100644 meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch delete mode 100644 meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch rename meta-gnome/recipes-gnome/evince/{evince_2.32.0.bb => evince_3.18.2.bb} (56%) diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch b/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch new file mode 100644 index 000..592f466 --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch @@ -0,0 +1,24 @@ +From 40921037d8e7205a3889d529fb4e06f79e1e88b0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 19 Feb 2016 16:52:18 +0200 +Subject: [PATCH] help: remove YELP macro + +Upstream-Status: Inappropriate [embedded-specific] +Signed-off-by: Alexander Kanavin +--- + help/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/help/Makefile.am b/help/Makefile.am +index 7835810..37c88ce 100644 +--- a/help/Makefile.am b/help/Makefile.am +@@ -1,5 +1,3 @@ +-@YELP_HELP_RULES@ +- + SUBDIRS = reference + + HELP_ID = evince +-- +2.7.0 + diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch deleted file mode 100644 index ebc8976..000 --- a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 00b5e55c90477eeac02bec58f032cb6916a1eb5c Mon Sep 17 00:00:00 2001 -From: Hib Eris -Date: Mon, 20 Feb 2012 21:36:16 +0100 -Subject: [PATCH] tiff: fix compile warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -Signed-off-by: Andreas Müller - backend/tiff/tiff2ps.c |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/backend/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c -index c0dc0bf..fc63c2e 100644 a/backend/tiff/tiff2ps.c -+++ b/backend/tiff/tiff2ps.c -@@ -1127,8 +1127,8 @@ PS_Lvl2page(TIFF2PSContext* ctx, TIFF* tif, uint32 w, uint32 h) - } - buf_data = (unsigned char *)_TIFFmalloc(chunk_size); - if (!buf_data) { -- TIFFError(ctx->filename, "Can't alloc %u bytes for %s.", -- chunk_size, tiled_image ? "tiles" : "strips"); -+ TIFFError(ctx->filename, "Can't alloc %u bytes for %s.", -+ (uint) chunk_size, tiled_image ? "tiles" : "strips"); - return(FALSE); - } - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch b/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch deleted file mode 100644 index 6368a31..000 --- a/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f4051f27aee7cbe88f206783461784c936d7f5db Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 15 Sep 2015 16:17:50 +0300 -Subject: [PATCH] Remove pkg-config check for gnome-icon-theme - -Theme is not required for building and the icons are provided by -adwaita-icon-theme anyway - -Upstream-Status: Inappropriate [Current versions are fixed] -Signed-off-by: Jussi Kukkonen - configure.ac | 7 --- - 1 file changed, 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d061c2e..7856410 100644 a/configure.ac -+++ b/configure.ac -@@ -175,13 +175,6 @@ case "$with_platform" in - SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso" - ;; - gnome) --# Evince has a rather soft run-time dependency on hicolor-icon-theme. --# If the hicolor theme is not available, Evince fails to display some --# icons. Because we cannot check for it at run-time, we instead --# would like to require the icon theme at compile-time. But, because --# the
[oe] [PATCH 03/38] gnome-bluetooth: update to 3.18.2
This also enable gobject introspection support. Drop obsolete patches. Signed-off-by: Alexander Kanavin--- .../0001-bluetooth-input-Fix-compile-errors.patch | 37 --- ...luetooth-client-use-valid-interface-names.patch | 122 - .../0003-Fix-build-with-libnotify-0.7.0.patch | 47 .../gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 38 --- .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb | 20 5 files changed, 20 insertions(+), 244 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch deleted file mode 100644 index 0b0cf8b..000 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e3c789d6dca9a8a99b60b86e28d8119c55253c13 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 15 May 2013 08:37:03 -0700 -Subject: [PATCH] bluetooth-input: Fix compile errors - -XID is unsigned long type so %d will error out with -Wformat -where format warnings are being treated at errors - -Signed-off-by: Khem Raj - -Upstream-Status: Unknown - wizard/bluetooth-input.c |4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/wizard/bluetooth-input.c b/wizard/bluetooth-input.c -index b3fbdaf..d17e67c 100644 a/wizard/bluetooth-input.c -+++ b/wizard/bluetooth-input.c -@@ -190,12 +190,12 @@ bluetooth_input_check_for_devices (BluetoothInput *input) - if (bluetooth_input_device_get_type (_info[i], _mouse, _keyboard) == FALSE) - continue; - if (is_mouse != FALSE) { -- g_message ("has mouse: %s (id = %d)", device_info[i].name, device_info[i].id); -+ g_message ("has mouse: %s (id = %lu)", device_info[i].name, device_info[i].id); - has_mouse = TRUE; - //break; - } - if (is_keyboard != FALSE) { -- g_message ("has keyboard: %s (id = %d)", device_info[i].name, device_info[i].id); -+ g_message ("has keyboard: %s (id = %lu)", device_info[i].name, device_info[i].id); - has_keyboard = TRUE; - //break; - } --- -1.7.9.5 - diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch deleted file mode 100644 index 99049a0..000 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 1555f85b222db0d536efe277d31b57b2a8b938f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 12 Feb 2015 01:19:41 +0100 -Subject: [PATCH] bluetooth-client: use valid interface names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate[version unmaintained upstream] - -Signed-off-by: Andreas Müller - lib/bluetooth-client.c | 12 ++-- - lib/bluetooth-client.xml | 6 +++--- - lib/test-agent.c | 2 +- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c -index d62d56d..02e194c 100644 a/lib/bluetooth-client.c -+++ b/lib/bluetooth-client.c -@@ -721,7 +721,7 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent, - BLUEZ_DEVICE_INTERFACE, path); - - if (device != NULL) -- device_get_properties(device, , NULL); -+ org_bluez_device_get_properties(device, , NULL); - } else - device = NULL; - -@@ -945,7 +945,7 @@ static void adapter_added(DBusGProxy *manager, - adapter = dbus_g_proxy_new_from_proxy(manager, - BLUEZ_ADAPTER_INTERFACE, path); - -- adapter_get_properties(adapter, , NULL); -+
[oe] [PATCH 00/38] Initial gobject introspection support for meta-openembedded
This patch adds gobject introspection support to recipes in meta-openembedded. To make it work, you need to fetch the following poky branch and build against it: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/gobject-introspection-experimental For general information about gobject introspection support in openembedded, see here: http://lists.openembedded.org/pipermail/openembedded-core/2015-November/113390.html NOTE to meta-oe maintainers: please queue this patchset and have it ready, the introspection support in oe-core should appear very soon and lots of things in meta-oe will break when it does. The following changes since commit a1e135a48add7575682bf53db5e02e753580: Revert "toybox: upgrade to 0.7.0" (2016-03-07 13:02:19 +0100) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib akanavin/gobject-introspection-fixes http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=akanavin/gobject-introspection-fixes Alexander Kanavin (38): evolution-data-server: fix gobject introspection evince: update to 3.18.2 gnome-bluetooth: update to 3.18.2 gnome-desktop: remove pygtk dependency gnumeric: fix gobject introspection support libgsf: fix gobject introspection libwnck: fix gobject introspection libxklavier: fix gobject introspection goffice: fix gobject introspection tracker: fix gobject introspection gupnp: fix gobject introspection rygel: fix gobject introspection media-service-demo: remove the recipe python-gst: remove the 0.10 recipe gstreamer-0.10: disable gobject introspection libmediaart: fix gobject introspection bluez4: use real introspection instead of legacy pygobject modemmanager: fix vala support networkmanager: fix introspection and vala support telepathy-glib: fix gobject introspection support libgee: fix gobject introspection support polkit: fix gobject introspection support gtkextra: fix gobject introspection support libunique: fix gobject introspection support babl: update to 0.1.16 gegl: update to 0.3.4 gimp: accept newer versins of babl and gegl omgps: remove the recipe poppler: fix gobject introspection udisks2: fix gobject introspection upower: fix gobject introspection python-dbusmock: use real introspection instead on legacy pygobject gnome-menus: fix gobject introspection libgdata: fix gobject introspection libgtop: fix gobject introspection nautilus: fix gobject introspection network-manager-applet: fix gobject introspection gnome-panel: fix gobject introspection .../network-manager-applet_1.0.10.bb | 2 +- .../recipes-gnome/eds/evolution-data-server_git.bb | 6 +- .../evince/0001-help-remove-YELP-macro.patch | 24 .../evince/0001-tiff-fix-compile-warning.patch | 33 -- ...ove-pkg-config-check-for-gnome-icon-theme.patch | 35 -- .../evince/evince/cross-compile-fix.patch | 25 - .../evince/{evince_2.32.0.bb => evince_3.18.2.bb} | 31 ++--- .../0001-bluetooth-input-Fix-compile-errors.patch | 37 -- ...luetooth-client-use-valid-interface-names.patch | 122 .../0003-Fix-build-with-libnotify-0.7.0.patch | 47 .../gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 38 --- .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb | 20 .../gnome-desktop/gnome-desktop_2.32.1.bb | 6 +- .../gnome-menus/gnome-menus3_3.10.1.bb | 2 +- .../gnome-menus/gnome-menus_2.30.5.bb | 2 +- .../gnome-panel/gnome-panel_2.32.1.bb | 2 +- ...n-drop-introspection-macros-replace-them-.patch | 84 ++ .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb | 5 +- .../recipes-gnome/libgdata/libgdata_0.16.1.bb | 2 +- ...c-drop-a-copy-paste-of-introspection.m4-m.patch | 103 + meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb | 4 +- meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb | 2 +- meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 4 +- .../recipes-gnome/libxklavier/libxklavier_5.3.bb | 4 +- .../recipes-gnome/nautilus/nautilus_2.32.2.bb | 2 +- ...igure.ac-fix-paths-to-introspection-tools.patch | 41 +++ .../recipes-support/goffice/goffice_0.10.1.bb | 4 +- .../recipes-support/tracker/tracker_0.14.2.bb | 7 +- .../recipes-connectivity/gupnp/gssdp.inc | 12 +- .../recipes-connectivity/gupnp/gupnp-av.inc| 9 +- .../recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb | 4 +- .../recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb | 6 +- .../recipes-connectivity/gupnp/gupnp.inc | 12 +- .../recipes-connectivity/gupnp/no-vala.inc | 5 - .../recipes-connectivity/rygel/rygel_0.28.2.bb | 4 +- .../dleyna/media-service-demo_git.bb | 18 --- .../gstreamer-0.10/gst-plugins.inc | 2 +- .../gstreamer-0.10/gst-rtsp_0.10.8.bb |
[oe] [meta-webserver][PATCH v3 2/3] nginx: add stable version 1.8.1 as alternative to the mainline version 1.9.x
The 1.8 branch is the current stable branch of nginx. This means the branch doesn't get new features, but is still supported with bugfixes. Depending on the use case it is more suitable to use on an embedded device than the 1.9 branch which adds new features with every release. --- meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +- meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb | 6 ++ meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 53e3235..2169b67 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -6,7 +6,7 @@ concurrency, performance and low memory usage." HOMEPAGE = "http://nginx.org/; LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + SECTION = "net" DEPENDS = "libpcre gzip openssl" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb new file mode 100644 index 000..089f547 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3845852aedfa8d6d7765f55d06cc3ebd" + +SRC_URI[md5sum] = "2e91695074dbdfbf1bcec0ada9fda462" +SRC_URI[sha256sum] = "8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb index d76bd9e..3b9d26f 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb @@ -1,5 +1,7 @@ require nginx.inc +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + SRC_URI[md5sum] = "76eb5853a1190e0cfc691aa21c545de3" SRC_URI[sha256sum] = "6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b368a51f" -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v3 3/3] nginx: make the 1.8.x branch the default
The 1.9.x branch is still supported but it needs to be explicitly selected. --- meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb index 3b9d26f..3eec0f9 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb @@ -1,5 +1,9 @@ require nginx.inc +# 1.9.x is the current mainline branches containing all new features +# 1.8.x branch is the current stable branch, the recommended default +DEFAULT_PREFERENCE = "-1" + LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" SRC_URI[md5sum] = "76eb5853a1190e0cfc691aa21c545de3" -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v3 1/3] nginx: split parts out of the recipe into nginx.inc
nginx has two maintained branches. - stable: is the long term maintained branch where only bugfixes occur - mainline: is the branch where new features get added This change is in preparation to support these two branches. --- meta-webserver/recipes-httpd/nginx/nginx.inc | 137 + meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 137 + 2 files changed, 139 insertions(+), 135 deletions(-) create mode 100644 meta-webserver/recipes-httpd/nginx/nginx.inc diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc new file mode 100644 index 000..53e3235 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -0,0 +1,137 @@ +SUMMARY = "HTTP and reverse proxy server" + +DESCRIPTION = "Nginx is a web server and a reverse proxy server for \ +HTTP, SMTP, POP3 and IMAP protocols, with a strong focus on high \ +concurrency, performance and low memory usage." + +HOMEPAGE = "http://nginx.org/; +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" +SECTION = "net" + +DEPENDS = "libpcre gzip openssl" + +SRC_URI = " \ + http://nginx.org/download/nginx-${PV}.tar.gz \ + file://nginx-cross.patch \ + file://nginx.conf \ + file://nginx.init \ + file://nginx-volatile.conf \ + file://nginx.service \ +" + +inherit update-rc.d useradd + +CFLAGS_append = " -fPIE -pie" +CXXFLAGS_append = " -fPIE -pie" + +NGINX_WWWDIR ?= "${localstatedir}/www/localhost" +NGINX_USER ?= "www" + +EXTRA_OECONF = "" +DISABLE_STATIC = "" + +do_configure () { + if [ "${SITEINFO_BITS}" = "64" ]; then + PTRSIZE=8 + else + PTRSIZE=4 + fi + + echo $CFLAGS + echo $LDFLAGS + + ./configure \ + --crossbuild=Linux:${TUNE_ARCH} \ + --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-int=4 \ + --with-long=${PTRSIZE} \ + --with-long-long=8 \ + --with-ptr-size=${PTRSIZE} \ + --with-sig-atomic-t=${PTRSIZE} \ + --with-size-t=${PTRSIZE} \ + --with-off-t=${PTRSIZE} \ + --with-time-t=${PTRSIZE} \ + --with-sys-nerr=132 \ + --conf-path=${sysconfdir}/nginx/nginx.conf \ + --http-log-path=${localstatedir}/log/nginx/access.log \ + --error-log-path=${localstatedir}/log/nginx/error.log \ + --pid-path=/run/nginx/nginx.pid \ + --prefix=${prefix} \ + --with-http_ssl_module \ + --with-http_gzip_static_module \ + ${EXTRA_OECONF} +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rm -fr ${D}${localstatedir}/run ${D}/run + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN} - - - -" \ +> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + install -d ${D}${sysconfdir}/${BPN} + ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run + install -d ${D}${NGINX_WWWDIR} + mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ + chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx + + install -d ${D}${sysconfdir}/nginx + install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf + install -d ${D}${sysconfdir}/nginx/sites-enabled + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx + +if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ +sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ +-e 's,@LOCALSTATEDIR@,${localstatedir},g' \ +-e 's,@BASEBINDIR@,${base_bindir},g' \ +${D}${systemd_unitdir}/system/nginx.service +fi +} + +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} + +FILES_${PN} += "${localstatedir}/ \ +${systemd_unitdir}/system/nginx.service \ +" +
[oe] systemd service not enabled when adding simple recipe to image
Hello, I have a problem enabling a simple systemd service: If I install my package using the .ipk file, everything works fine (systemd service ist enabled after install), but if I create an image containing this package, the service is disabled. It can be enabled by calling "systemctl enable ". All files of the package are installed correctly (only the systemd symlink is missing). I have other packages with working systemd, the problem exists only in the simple case with a single shell script. I use Angstrom v2015.06 / Yocto 1.8 Can anybody tell me what I'm doing wrong? Thank you very much, Sandro My files: ## mytestscript.bb SUMMARY = "systemd test script" DESCRIPTION = "This script is a quick demo for a not initialized systemd service." SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" inherit systemd SRC_URI = "file://mytestscript.service \ file://mytestscript.sh \ " do_compile() { } do_install () { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/mytestscript.sh ${D}${bindir} install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/mytestscript.service ${D}${systemd_unitdir}/system sed -i -e 's,@BINDIR@,${bindir},g' \ ${D}${systemd_unitdir}/system/mytestscript.service } NATIVE_SYSTEMD_SUPPORT = "1" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "mytestscript.service" SYSTEMD_AUTO_ENABLE = "enable" FILES_${PN} += "${systemd_unitdir}/system/mytestscript.service" ## files/mytestscript.sh # #!/bin/sh echo "Hello from testscript" ## files/mytestscript.service ## [Unit] Description=A test script After=local-fs.target [Service] Type=oneshot ExecStart=@BINDIR@/mytestscript.sh [Install] WantedBy=multi-user.target -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel