Small fixes

PATCH In review Martin Jansa 3 participants 12 messages Dec 15, 2011 – Dec 16, 2011

lore

Share & tools

lore

Martin Jansa

author

2011-12-15 12:19 UTC #0 lore raw

cover Small fixes

The following changes since commit 6f36625d072054737e0aa797fb791c35d999addc:

florence: clean up recipe (2011-12-15 09:42:59 +0100)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Denis 'GNUtoo' Carikli (1):
epdfview: disable cups

Martin Jansa (4):
xf86-input-void: drop archive prefix from checksums
mplayer2: drop FULL_OPTIMIZATION_armv7a pixman,libav,libvpx,fftwf: bump PR after arm OVERRIDES changes in
oe-core
libvpx: disable tree-vectorize

Richard Purdie (1):
samba: Force python disabled for now to avoid host contamination

 meta-efl/recipes-efl/efl/epdfview_0.1.8.bb         |    4 ++++
 meta-oe/recipes-connectivity/samba/samba_3.5.6.bb  |    3 +++
 .../xorg-driver/xf86-input-void_1.4.0.bb           |    4 ++--
 .../xorg-lib/pixman_0.24.0.bbappend                |    2 +-
 meta-oe/recipes-multimedia/libav/libav.inc         |    2 +-
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    3 +--
 meta-oe/recipes-multimedia/webm/libvpx.inc         |   15 +++++++++++++--
 meta-oe/recipes-support/fftw/fftwf_3.2.2.bb        |    2 +-
 8 files changed, 26 insertions(+), 9 deletions(-)

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-15 12:22 UTC #1 lore raw

PATCH 1/6 epdfview: disable cups

From: Denis 'GNUtoo' Carikli <[email protected]>

* we usually don't want cups in target images, but cups was sometimes autodetected and compilation failed
* | PrintPter.cxx:19:23: fatal error: cups/cups.h: No such file or directory Under the SHR distribution for the nokia900 machine(and maybe all other machines)

Signed-off-by Denis 'GNUtoo' Carikli <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta-efl/recipes-efl/efl/epdfview_0.1.8.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

meta-efl/recipes-efl/efl/epdfview_0.1.8.bb +4 -0

index 5351733..5f6bbf4 100644
@@ -5,6 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 SECTION = "x11/applications"
 DEPENDS = "gtk+ poppler"
 
+PR = "r1"
+
+EXTRA_OECONF += "--without-cups"
+
 inherit autotools gettext
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-15 12:23 UTC #2 lore raw

PATCH 2/6 xf86-input-void: drop archive prefix from checksums

* .inc file from oe-core doesn't have name=archive in SRC_URI

Signed-off-by Martin Jansa <[email protected]>

---
 .../xorg-driver/xf86-input-void_1.4.0.bb           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb +2 -2

index a6e49a5..ccd27f1 100644
@@ -4,5 +4,5 @@ PR = "${INC_PR}.0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"
 
-SRC_URI[archive.md5sum] = "3056bc7c57db8c5d56039648c0530c45"
-SRC_URI[archive.sha256sum] = "aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674"
+SRC_URI[md5sum] = "3056bc7c57db8c5d56039648c0530c45"
+SRC_URI[sha256sum] = "aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674"

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-15 12:23 UTC #3 lore raw

PATCH 3/6 samba: Force python disabled for now to avoid host contamination

In reply to Martin Jansa

From: Richard Purdie <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-connectivity/samba/samba_3.5.6.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta-oe/recipes-connectivity/samba/samba_3.5.6.bb +3 -0

index d5945f9..6885235 100644
@@ -3,6 +3,8 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
+PR = "r1"
+
 SRC_URI += "file://config-h.patch \
             file://tdbheaderfix.patch;patchdir=.."

@@ -12,6 +14,7 @@ SRC_URI[sha256sum] = "466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd5
 S = "${WORKDIR}/samba-${PV}/source3"
 
 EXTRA_OECONF += "\
+	ac_cv_path_PYTHON=/not/exist \
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
 	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
 	linux_getgrouplist_ok=no \

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-15 12:23 UTC #4 lore raw

PATCH 4/6 mplayer2: drop FULL_OPTIMIZATION_armv7a

In reply to Martin Jansa

* we had -ftree-vectorize instead of -frename-registers here, but that's causing ICE with latest gcc-4.6 from meta-oe
* similar to issue in libvpx
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
and lowering to -O3 is not enough in this case

  | libmpcodecs/ad_imaadpcm.c: In function 'qt_ima_adpcm_decode_block':
  | libmpcodecs/ad_imaadpcm.c:177:12: internal compiler error: Segmentation fault
  | Please submit a full bug report,
  | with preprocessed source if appropriate.
  | See <http://gcc.gnu.org/bugs.html> for instructions.
  | make: *** [libmpcodecs/ad_imaadpcm.o] Error 1

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +1 -2

index ee64ca8..b892420 100644
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
 ARM_INSTRUCTION_SET = "ARM"
 
 PV = "2.0+gitr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 PARALLEL_MAKE = ""

@@ -131,7 +131,6 @@ EXTRA_OECONF_append_armv6 = " --enable-armv6"
 EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 CFLAGS_append = " -I${S}/libdvdread4 "

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-15 13:36 UTC #5 lore raw

Re: [PATCH][meta-oe][meta-efl 4/6] mplayer2: drop FULL_OPTIMIZATION_armv7a

Quoted 2 lines · Martin Jansa

* we had -ftree-vectorize instead of -frename-registers here, but that's causing ICE with latest gcc-4.6 from meta-oe

I'll update this one to pass even -fno-tree-vectorize, because this patch fixed it for nokia900, but qemux86-64 still fails

Quoted 39 lines

* similar to issue in libvpx
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
and lowering to -O3 is not enough in this case

  | libmpcodecs/ad_imaadpcm.c: In function 'qt_ima_adpcm_decode_block':
  | libmpcodecs/ad_imaadpcm.c:177:12: internal compiler error: Segmentation fault
  | Please submit a full bug report,
  | with preprocessed source if appropriate.
  | See <http://gcc.gnu.org/bugs.html> for instructions.
  | make: *** [libmpcodecs/ad_imaadpcm.o] Error 1

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +1 -2

index ee64ca8..b892420 100644
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
 ARM_INSTRUCTION_SET = "ARM"
 
 PV = "2.0+gitr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 PARALLEL_MAKE = ""

@@ -131,7 +131,6 @@ EXTRA_OECONF_append_armv6 = " --enable-armv6"
 EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 CFLAGS_append = " -I${S}/libdvdread4 "

Signature · 1 line

1.7.8

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2011-12-15 13:38 UTC #6 lore raw

PATCH 4/6 mplayer2: drop FULL_OPTIMIZATION_armv7a and add -fno-tree-vectorize

* we had -ftree-vectorize instead of -frename-registers here, but that's causing ICE with latest gcc-4.6 from meta-oe
* qemux86-64 was still failing without -fno-tree-vectorize
* similar to issue in libvpx
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
and lowering to -O3 is not enough in this case

  | libmpcodecs/ad_imaadpcm.c: In function 'qt_ima_adpcm_decode_block':
  | libmpcodecs/ad_imaadpcm.c:177:12: internal compiler error: Segmentation fault
  | Please submit a full bug report,
  | with preprocessed source if appropriate.
  | See <http://gcc.gnu.org/bugs.html> for instructions.
  | make: *** [libmpcodecs/ad_imaadpcm.o] Error 1

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +2 -3

index ee64ca8..72d5754 100644
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
 ARM_INSTRUCTION_SET = "ARM"
 
 PV = "2.0+gitr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 PARALLEL_MAKE = ""

@@ -130,8 +130,7 @@ EXTRA_OECONF = " \
 EXTRA_OECONF_append_armv6 = " --enable-armv6"
 EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math -fno-tree-vectorize"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 CFLAGS_append = " -I${S}/libdvdread4 "

Signature · 1 line

1.7.8

Khem Raj

2011-12-16 21:52 UTC #7 lore raw

Re: [PATCH][meta-oe][meta-efl 4/6] mplayer2: drop FULL_OPTIMIZATION_armv7a and add -fno-tree-vectorize

Quoted 6 lines · Martin Jansa

* we had -ftree-vectorize instead of -frename-registers here, but that's causing ICE with latest gcc-4.6 from meta-oe
* qemux86-64 was still failing without -fno-tree-vectorize
* similar to issue in libvpx
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
and lowering to -O3 is not enough in this case

Quoted 7 lines

  | libmpcodecs/ad_imaadpcm.c: In function 'qt_ima_adpcm_decode_block':
  | libmpcodecs/ad_imaadpcm.c:177:12: internal compiler error: Segmentation fault
  | Please submit a full bug report,
  | with preprocessed source if appropriate.
  | See <http://gcc.gnu.org/bugs.html> for instructions.
  | make: *** [libmpcodecs/ad_imaadpcm.o] Error 1

can you create a preprocessed file for this please so we can look at it

Quoted 36 lines

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +2 -3

index ee64ca8..72d5754 100644
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
 ARM_INSTRUCTION_SET = "ARM"
 
 PV = "2.0+gitr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 PARALLEL_MAKE = ""

@@ -130,8 +130,7 @@ EXTRA_OECONF = " \
 EXTRA_OECONF_append_armv6 = " --enable-armv6"
 EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math -fno-tree-vectorize"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 CFLAGS_append = " -I${S}/libdvdread4 "

Signature · 7 lines

1.7.8


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line

-Khem

Martin Jansa

author

2011-12-15 12:23 UTC #8 lore raw

PATCH 5/6 pixman, libav, libvpx, fftwf: bump PR after arm OVERRIDES changes in oe-core

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../xorg-lib/pixman_0.24.0.bbappend                |    2 +-
 meta-oe/recipes-multimedia/libav/libav.inc         |    2 +-
 meta-oe/recipes-multimedia/webm/libvpx.inc         |    2 +-
 meta-oe/recipes-support/fftw/fftwf_3.2.2.bb        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

meta-oe/recipes-graphics/xorg-lib/pixman_0.24.0.bbappend +1 -1

index 61a9558..ea28422 100644
@@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 DEPENDS += "perl-native"
 BBCLASSEXTEND = "native"
 
-PRINC = "6"
+PRINC = "7"
 
 SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch"

meta-oe/recipes-multimedia/libav/libav.inc +1 -1

index c8277f9..89b14ca 100644
@@ -11,7 +11,7 @@ ARM_INSTRUCTION_SET = "arm"
 # faac faad2 lame schroedinger libgsm
 DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 inherit autotools pkgconfig

meta-oe/recipes-multimedia/webm/libvpx.inc +1 -1

index 76e319f..fbece03 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "vpx Multi-Format Codec SDK"
 LICENSE = "BSD"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
 S = "${WORKDIR}/libvpx-v${PV}"

meta-oe/recipes-support/fftw/fftwf_3.2.2.bb +1 -1

index da3fc6f..466ba8d 100644
@@ -1,6 +1,6 @@
 require fftw.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz \
            file://vesperix-neon.patch \

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-15 12:23 UTC #9 lore raw

PATCH 6/6 libvpx: disable tree-vectorize

In reply to Martin Jansa

* It's causing ICE with latest gcc-4.6 from meta-oe, see:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-multimedia/webm/libvpx.inc |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

meta-oe/recipes-multimedia/webm/libvpx.inc +13 -2

index fbece03..8434f38 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "vpx Multi-Format Codec SDK"
 LICENSE = "BSD"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
 S = "${WORKDIR}/libvpx-v${PV}"

@@ -10,7 +10,18 @@ S = "${WORKDIR}/libvpx-v${PV}"
 # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
 ARM_INSTRUCTION_SET = "arm"
 
-CFLAGS += "-fPIC"
+#-ftree-vectorize was causing ICE with gcc-4.6 from meta-oe, see
+# http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
+#|     [CC] vpx_scale/generic/gen_scalers.c.o
+#| vpx_scale/generic/gen_scalers.c: In function 'vp8cx_vertical_band_3_4_scale_c':
+#| vpx_scale/generic/gen_scalers.c:537:6: internal compiler error: in vect_get_vec_def_for_stmt_copy, at tree-vect-stmts.c:1390
+#| Please submit a full bug report,
+#| with preprocessed source if appropriate.
+#| See <http://gcc.gnu.org/bugs.html> for instructions.
+#| make[1]: *** [vpx_scale/generic/gen_scalers.c.o] Error 1
+#| make: *** [.DEFAULT] Error 2
+
+CFLAGS += "-fPIC -fno-tree-vectorize"
 
 export CC
 export LD = "${CC}"

Signature · 1 line

1.7.8

Koen Kooi

2011-12-15 17:53 UTC #10 lore raw

In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 15-12-11 13:12, Martin Jansa schreef:

Quoted 8 lines

The following changes since commit
6f36625d072054737e0aa797fb791c35d999addc:
florence: clean up recipe (2011-12-15 09:42:59 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Does

Quoted 1 line

that have the updated mplayer2 patch?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7qMnQACgkQMkyGM64RGpEUJACePpB9nwYqrc93XD2LIUFPnsCl bw4An2A3Z+A9bTuqW+Yn0OTcwm1Joxek
=vnup
-----END PGP SIGNATURE-----

Martin Jansa

author

2011-12-15 18:17 UTC #11 lore raw

Quoted 9 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 15-12-11 13:12, Martin Jansa schreef:
Quoted 5 lines
The following changes since commit
6f36625d072054737e0aa797fb791c35d999addc:
florence: clean up recipe (2011-12-15 09:42:59 +0100)

Quoted 7 lines

Quoted 3 lines
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Does
Quoted 1 line
that have the updated mplayer2 patch?

Yes

Quoted 14 lines

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk7qMnQACgkQMkyGM64RGpEUJACePpB9nwYqrc93XD2LIUFPnsCl bw4An2A3Z+A9bTuqW+Yn0OTcwm1Joxek
=vnup
-----END PGP SIGNATURE-----
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]