gstreamer 0.10.x: remove do_configure_prepend

PATCH In review Robert Yang 2 participants 6 messages Mar 21, 2012 – Mar 31, 2012

lore

Share & tools

lore

Robert Yang

author

2012-03-21 08:47 UTC #0 lore raw

cover gstreamer 0.10.x: remove do_configure_prepend

Test info:

Have tested on qemuarm and qemux86.

// Robert

The following changes since commit 224ff370b4636cdd33c47c1e6341ef43a67e0227:

xserver-kdrive: compile xserver without dtrace support (2012-03-20 15:21:39 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/gst
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/gst

Robert Yang (1):
gstreamer 0.10.x: remove do_configure_prepend

 .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
 .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
 .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

Robert Yang

author

2012-03-21 08:47 UTC #1 lore raw

PATCH 1/1 gstreamer 0.10.x: remove do_configure_prepend

Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4 to compile under libtool 2.2.2, but our libtool has been upgraded to 2.4.2, and:

for the 3 recipes:

    gst-plugins-bad_0.10.22.bb
    gst-plugins-base_0.10.35.bb
    gst-plugins-good_0.10.30.bb

They don't have m4/lib-link.m4 any more.

For the gst-plugins-ugly_0.10.18.bb, though it has m4/lib-link.m4, our libtool version is now 2.4.2, so we can remove the do_configure_prepend from all of them.

[YOCTO #2148]

Signed-off-by Robert Yang <[email protected]>

---
 .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
 .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
 .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb +1 -6

index 2c97a10..5c613c3 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
 
-PR = "r3"
+PR = "r4"
 
 inherit gettext

@@ -17,10 +17,5 @@ EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disab
 
 ARM_INSTRUCTION_SET = "arm"
 
-do_configure_prepend() {
-	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-	rm ${S}/m4/lib-link.m4 || true
-}
-
 SRC_URI[md5sum] = "9a2acee1f386f71247003d0d7090fb1c"
 SRC_URI[sha256sum] = "d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c"

meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb +1 -6

index 93f8eb3..812d209 100644
@@ -14,13 +14,8 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
 SRC_URI[md5sum] = "1d300983525f4f09030eb3ba47cb04b0"
 SRC_URI[sha256sum] = "cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"
 
-PR = "r1"
+PR = "r2"
 
 inherit gettext
 
 EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs"
-
-do_configure_prepend() {
-	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-	rm -f ${S}/m4/lib-link.m4
-}

meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb +1 -6

index ebd49ab..7810b5b 100644
@@ -7,17 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
 	    speex libsoup-2.4 pulseaudio"
-PR = "r5"
+PR = "r6"
 
 inherit gettext gconf
 
 EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check"
 
-do_configure_prepend() {
-	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-	rm ${S}/m4/lib-link.m4 || true
-}
-
 SRC_URI[md5sum] = "62fd7a3ef187c4f99b3d7c352d58dae9"
 SRC_URI[sha256sum] = "b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"

meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb +1 -6

index 7f87cd3..1a3c96b 100644
@@ -8,16 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
 
 DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
-PR = "r1"
+PR = "r2"
 
 inherit gettext
 
 EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia"
 
-do_configure_prepend() {
-	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-	rm ${S}/m4/lib-link.m4 || true
-}
-
 SRC_URI[md5sum] = "04a7009a4efea2844075949c111f5e4d"
 SRC_URI[sha256sum] = "f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14"

Signature · 1 line

1.7.1

Richard Purdie

2012-03-21 12:45 UTC #2 lore raw

Quoted 17 lines · Robert Yang

Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4 to compile under libtool 2.2.2, but our libtool has been upgraded to 2.4.2, and:
for the 3 recipes:
    gst-plugins-bad_0.10.22.bb
    gst-plugins-base_0.10.35.bb
    gst-plugins-good_0.10.30.bb
They don't have m4/lib-link.m4 any more.
For the gst-plugins-ugly_0.10.18.bb, though it has m4/lib-link.m4, our libtool version is now 2.4.2, so we can remove the do_configure_prepend from all of them.
[YOCTO #2148]

Quoted 7 lines

Signed-off-by Robert Yang <[email protected]>

---
 .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
 .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
 .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

Not so easy I'm afraid. We need to ensure our libtool is being used. Even if the version matches, our libtool is patched to ensure the sysroot and rpaths work correctly. I'm therefore a little nervous about removing these at this point.

If we go through autoconf and automake and make sure our .m4 files are used in preference to the recipe source supplied ones, I'll consider patches like this but not until we've verified that.

Cheers,

Richard

Robert Yang

author

2012-03-21 14:54 UTC #3 lore raw

Hi Richard,

Please see my comments inline ...

Quoted 26 lines · Richard Purdie

Quoted 17 lines · Robert Yang
Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4 to compile under libtool 2.2.2, but our libtool has been upgraded to 2.4.2, and:
for the 3 recipes:
     gst-plugins-bad_0.10.22.bb
     gst-plugins-base_0.10.35.bb
     gst-plugins-good_0.10.30.bb
They don't have m4/lib-link.m4 any more.
For the gst-plugins-ugly_0.10.18.bb, though it has m4/lib-link.m4, our libtool version is now 2.4.2, so we can remove the do_configure_prepend from all of them.
[YOCTO #2148]
Quoted 7 lines
Signed-off-by Robert Yang<[email protected]>
---
  .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
  .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
  .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
  .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    7 +------
  4 files changed, 4 insertions(+), 24 deletions(-)

Quoted 5 lines

Not so easy I'm afraid. We need to ensure our libtool is being used. Even if the version matches, our libtool is patched to ensure the sysroot and rpaths work correctly. I'm therefore a little nervous about removing these at this point.

Yes, I agree with you, though I checked the log.do_configure and log.do_compile, it used our libtool. The safe way maybe just remove the do_configure_prepend from gst-plugins-bad, gst-plugins-base and
gst-plugins-good since they don't have the ${S}/m4/lib-link.m4 any more.

For gst-plugins-ugly, we can remove when it would not have ${S}/m4/lib-link.m4.

I noticed this because there was error when build gst-plugins-base/bad/good:

rm: cannot remove `/path/to/m4/lib-link.m4': No such file or directory.

Here is an updated patch and pull request which only removes do_configure_prepend for gst-plugins-base/bad/good:
(I'm not sure whether send a V2 is preferred or not for such case).

git://git.pokylinux.org/poky-contrib robert/gst_v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/gst_v2

Subject: [PATCH 1/1] gstreamer 0.10.x: remove do_configure_prepend

Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4, but the 3 recipes don't have m4/lib-link.m4 any more:

    gst-plugins-bad_0.10.22.bb
    gst-plugins-base_0.10.35.bb
    gst-plugins-good_0.10.30.bb

[YOCTO #2148]

Signed-off-by Robert Yang <[email protected]>

---
 .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
 .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.22.bb +1 -6

index 2c97a10..5c613c3 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg"
 
-PR = "r3"
+PR = "r4"
 
 inherit gettext

@@ -17,10 +17,5 @@ EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disab
 
 ARM_INSTRUCTION_SET = "arm"
 
-do_configure_prepend() {
-	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-	rm ${S}/m4/lib-link.m4 || true
-}
-
 SRC_URI[md5sum] = "9a2acee1f386f71247003d0d7090fb1c"
 SRC_URI[sha256sum] =

"d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c"

meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb +0 -0

index 93f8eb3..812d209 100644
@@ -14,13 +14,8 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
 SRC_URI[md5sum] = "1d300983525f4f09030eb3ba47cb04b0"
 SRC_URI[sha256sum] =

"cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"

-PR = "r1"
+PR = "r2"

inherit gettext

EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs"
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm -f ${S}/m4/lib-link.m4
-}

meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb +1 -7

index ebd49ab..7810b5b 100644
@@ -7,17 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
 	    speex libsoup-2.4 pulseaudio"
-PR = "r5"
+PR = "r6"
 
 inherit gettext gconf
 
 EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 
--disable-libcaca --disable-hal --without-check"
 
-do_configure_prepend() {
-	# This m4 file contains nastiness which conflicts with libtool 2.2.2
-	rm ${S}/m4/lib-link.m4 || true
-}
-
 SRC_URI[md5sum] = "62fd7a3ef187c4f99b3d7c352d58dae9"
 SRC_URI[sha256sum] =

"b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"

Signature · 4 lines

1.7.1


// Robert

Quoted 14 lines

If we go through autoconf and automake and make sure our .m4 files are used in preference to the recipe source supplied ones, I'll consider patches like this but not until we've verified that.
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Richard Purdie

2012-03-30 13:34 UTC #4 lore raw

Quoted 55 lines · Robert Yang

Hi Richard,
Please see my comments inline ...
Quoted 26 lines · Richard Purdie
Quoted 17 lines · Robert Yang
Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4 to compile under libtool 2.2.2, but our libtool has been upgraded to 2.4.2, and:
for the 3 recipes:
     gst-plugins-bad_0.10.22.bb
     gst-plugins-base_0.10.35.bb
     gst-plugins-good_0.10.30.bb
They don't have m4/lib-link.m4 any more.
For the gst-plugins-ugly_0.10.18.bb, though it has m4/lib-link.m4, our libtool version is now 2.4.2, so we can remove the do_configure_prepend from all of them.
[YOCTO #2148]
Quoted 7 lines
Signed-off-by Robert Yang<[email protected]>
---
  .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
  .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
  .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
  .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    7 +------
  4 files changed, 4 insertions(+), 24 deletions(-)
Quoted 5 lines
Not so easy I'm afraid. We need to ensure our libtool is being used. Even if the version matches, our libtool is patched to ensure the sysroot and rpaths work correctly. I'm therefore a little nervous about removing these at this point.
Yes, I agree with you, though I checked the log.do_configure and log.do_compile, it used our libtool. The safe way maybe just remove the do_configure_prepend from gst-plugins-bad, gst-plugins-base and gst-plugins-good since they don't have the ${S}/m4/lib-link.m4 any more.
For gst-plugins-ugly, we can remove when it would not have ${S}/m4/lib-link.m4.
I noticed this because there was error when build gst-plugins-base/bad/good:
rm: cannot remove `/path/to/m4/lib-link.m4': No such file or directory.
Here is an updated patch and pull request which only removes do_configure_prepend for gst-plugins-base/bad/good:
(I'm not sure whether send a V2 is preferred or not for such case).
git://git.pokylinux.org/poky-contrib robert/gst_v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/gst_v2

Quoted 8 lines

Subject: [PATCH 1/1] gstreamer 0.10.x: remove do_configure_prepend
Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4, but the 3 recipes don't have m4/lib-link.m4 any more:
     gst-plugins-bad_0.10.22.bb
     gst-plugins-base_0.10.35.bb
     gst-plugins-good_0.10.30.bb

For what its worth, I just looked at the tarballs for these and the .m4 files are still there in the two I checked. This patch is therefore not right in its current form.

Cheers,

Richard

Robert Yang

author

2012-03-31 01:30 UTC #5 lore raw

Quoted 65 lines · Richard Purdie

Quoted 55 lines · Robert Yang
Hi Richard,
Please see my comments inline ...
Quoted 26 lines · Richard Purdie
Quoted 17 lines · Robert Yang
Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4 to compile under libtool 2.2.2, but our libtool has been upgraded to 2.4.2, and:
for the 3 recipes:
      gst-plugins-bad_0.10.22.bb
      gst-plugins-base_0.10.35.bb
      gst-plugins-good_0.10.30.bb
They don't have m4/lib-link.m4 any more.
For the gst-plugins-ugly_0.10.18.bb, though it has m4/lib-link.m4, our libtool version is now 2.4.2, so we can remove the do_configure_prepend from all of them.
[YOCTO #2148]
Quoted 7 lines
Signed-off-by Robert Yang<[email protected]>
---
   .../gstreamer/gst-plugins-bad_0.10.22.bb           |    7 +------
   .../gstreamer/gst-plugins-base_0.10.35.bb          |    7 +------
   .../gstreamer/gst-plugins-good_0.10.30.bb          |    7 +------
   .../gstreamer/gst-plugins-ugly_0.10.18.bb          |    7 +------
   4 files changed, 4 insertions(+), 24 deletions(-)
Quoted 5 lines
Not so easy I'm afraid. We need to ensure our libtool is being used. Even if the version matches, our libtool is patched to ensure the sysroot and rpaths work correctly. I'm therefore a little nervous about removing these at this point.
Yes, I agree with you, though I checked the log.do_configure and log.do_compile, it used our libtool. The safe way maybe just remove the do_configure_prepend from gst-plugins-bad, gst-plugins-base and gst-plugins-good since they don't have the ${S}/m4/lib-link.m4 any more.
For gst-plugins-ugly, we can remove when it would not have ${S}/m4/lib-link.m4.
I noticed this because there was error when build gst-plugins-base/bad/good:
rm: cannot remove `/path/to/m4/lib-link.m4': No such file or directory.
Here is an updated patch and pull request which only removes do_configure_prepend for gst-plugins-base/bad/good:
(I'm not sure whether send a V2 is preferred or not for such case).
git://git.pokylinux.org/poky-contrib robert/gst_v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/gst_v2
Quoted 8 lines
Subject: [PATCH 1/1] gstreamer 0.10.x: remove do_configure_prepend
Remove the do_configure_prepend which is used for removing ${S}/m4/lib-link.m4, but the 3 recipes don't have m4/lib-link.m4 any more:
      gst-plugins-bad_0.10.22.bb
      gst-plugins-base_0.10.35.bb
      gst-plugins-good_0.10.30.bb

Quoted 4 lines

For what its worth, I just looked at the tarballs for these and the .m4 files are still there in the two I checked. This patch is therefore not right in its current form.

I'm very sorry for this, it seems that I had checked in a wrong way before, I checked them after the build, but I should check the tarball directly or in do_patch stage, I will drop this.

// Robert

Quoted 10 lines

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