Skip to contentSkip to conversation

Patchset being use on O.S. Systems tree

PATCH In review Otavio Salvador 4 participants 12 messages Mar 22, 2011 – Mar 24, 2011

lore
Share & tools
lore
#0 lore raw

cover Patchset being use on O.S. Systems tree

Hello,

Here goes our current patchset that is being use on our tree. Besides this, there's also the udev change that is still open and unsolved.

[PATCH 1/4] wrapper/install: add -t support
[PATCH 2/4] flash-plugin: update to 10.2.153.1
[PATCH 3/4] vlc: use INC_PR
[PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

With following diffstat:

 bin/install                                    |    4 +-                                             
 recipes/adobe-flash/flash-plugin_10.0.22.87.bb |   35 --------------------
 recipes/adobe-flash/flash-plugin_10.2.153.1.bb |   41 ++++++++++++++++++++++++
 recipes/vlc/vlc.inc                            |    2 +
 recipes/vlc/vlc_0.9.2.bb                       |    2 +-
 recipes/vlc/vlc_0.9.6.bb                       |    2 +-
 recipes/vlc/vlc_0.9.8a.bb                      |    2 +-
 recipes/vlc/vlc_1.0.6.bb                       |    2 +-
 recipes/vlc/vlc_1.1.4.1.bb                     |    4 ++-
 9 files changed, 52 insertions(+), 42 deletions(-)

Cheers,

#1 lore raw

PATCH 1/4 wrapper/install: add -t support

---
 bin/install |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
bin/install +2 -2
index ab316f6..5cb4071 100755
@@ -3,12 +3,12 @@
 . $(dirname $0)/wrapper.sh
 
 saved=""
-while getopts dbCcMpSsvB:f:g:m:o:D opt; do
+while getopts dbCcMpSsvB:f:g:m:o:t:D opt; do
     case "$opt" in
         s)
             # Ignore strip argument
             ;;
-        B|f|g|m|o)
+        B|f|g|m|o|t)
             save "-$opt"
             save "$OPTARG"
             ;;
Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 2/4 flash-plugin: update to 10.2.153.1

In reply to Otavio Salvador
---
 recipes/adobe-flash/flash-plugin_10.0.22.87.bb |   35 --------------------
 recipes/adobe-flash/flash-plugin_10.2.153.1.bb |   41 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 35 deletions(-)
 delete mode 100644 recipes/adobe-flash/flash-plugin_10.0.22.87.bb
 create mode 100644 recipes/adobe-flash/flash-plugin_10.2.153.1.bb
recipes/adobe-flash/flash-plugin_10.0.22.87.bb deleted +0 -35
deleted file mode 100644
index d6cde60..0000000
@@ -1,35 +0,0 @@
-# Adobe provides two versions of flash player packages
-#
-# One "unversioned" download at :
-#
-#     ${ADOBE_MIRROR}/install_flash_player_9_linux.tar.gz
-#
-# And the other, versioned, which is encapsulated in RPM.
-#
-# We use the versioned one to make sure we can keep track of the
-# version and thus do repeatable builds at the cost of future download
-# failures when adobe updates.
-DESCRIPTION = "Adobe Flash 9 plugin for Mozilla/Firefox web browsers"
-LICENSE = "AdobeFlash"
-DEPENDS = "rpm2cpio-native"
-PR = "r1"
-
-SRC_URI = "${ADOBE_MIRROR}/flash-plugin-${PV}-release.i386.rpm"
-
-do_configure() {
-        rpm=${WORKDIR}/flash-plugin-${PV}-release.i386.rpm
-        if [ -f "$rpm" ]; then
-                rpm2cpio.pl $rpm | cpio -id
-                find . -type f -exec mv -i {} "`pwd`" \;
-        fi
-}
-do_install() {
-        mkdir -p ${D}${libdir}/mozilla/plugins/
-        install -m 0755 libflashplayer.so ${D}${libdir}/mozilla/plugins/
-        # AFAIK this is not needed
-        # install -m 0644 flashplayer.xpt ${D}${libdir}/mozilla/plugins/
-}
-
-FILES_${PN} = "${libdir}/* ${libdir}/X11/*"
-
-COMPATIBLE_HOST = "i.86.*-linux"
recipes/adobe-flash/flash-plugin_10.2.153.1.bb new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#3 lore raw

PATCH 3/4 vlc: use INC_PR

In reply to Otavio Salvador
---
 recipes/vlc/vlc.inc        |    2 ++
 recipes/vlc/vlc_0.9.2.bb   |    2 +-
 recipes/vlc/vlc_0.9.6.bb   |    2 +-
 recipes/vlc/vlc_0.9.8a.bb  |    2 +-
 recipes/vlc/vlc_1.0.6.bb   |    2 +-
 recipes/vlc/vlc_1.1.4.1.bb |    2 ++
 6 files changed, 8 insertions(+), 4 deletions(-)
recipes/vlc/vlc.inc +2 -0
index 6129cac..0435e87 100644
@@ -7,6 +7,8 @@ SECTION = "multimedia"
 DEPENDS = "libfribidi libtool hal gettext libgcrypt schroedinger virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
+INC_PR = "r4"
+
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
 
 inherit autotools
recipes/vlc/vlc_0.9.2.bb +1 -1
index 7dd6a75..bc24a75 100644
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 DEPENDS = "libtool hal gettext libgcrypt schroedinger virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
recipes/vlc/vlc_0.9.6.bb +1 -1
index f34ff6a..4b5cc20 100644
@@ -1,5 +1,5 @@
 require vlc.inc
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "cd71276ed867029a6d077a40bccd4d05"
 SRC_URI[sha256sum] = "ac091ba9b2e2e9aff293969b3405b145c09789e59ac0caab2247211a19e09a8a"
recipes/vlc/vlc_0.9.8a.bb +1 -1
index dd131b2..b846466 100644
@@ -5,7 +5,7 @@
 
 require vlc.inc
 
-PR = "r3"
+PR = "${INC_PR}.0"
 
 # ffmpeg from git (library version => 52) is required
 # libtool-native must be >= 2.2.4
recipes/vlc/vlc_1.0.6.bb +1 -1
index 12da530..4f98cfc 100644
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e41
 # ffmpeg from git (library version => 52) is required
 # libtool-native must be >= 2.2.4
 DEPENDS += "libdvdcss libdvdread"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "\
 	--enable-dvdread \
recipes/vlc/vlc_1.1.4.1.bb +2 -0
index df8f17c..6d4b877 100644
@@ -5,6 +5,8 @@
 
 require vlc.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
 SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"
 
Signature · 1 line
1.7.2.3
#4 lore raw

PATCH 4/4 vlc (1.1.4.1): depends on lua5.1

In reply to Otavio Salvador
---
 recipes/vlc/vlc_1.1.4.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/vlc/vlc_1.1.4.1.bb +2 -2
index 6d4b877..18297c9 100644
@@ -5,14 +5,14 @@
 
 require vlc.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
 SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"
 
 # ffmpeg from git (library version => 52) is required
 # libtool-native must be >= 2.2.4
-DEPENDS += "libdvdcss libdvdread lua5.1-native"
+DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
 RDEPENDS_${PN} += "lua5.1"
 
 EXTRA_OECONF += "\
Signature · 1 line
1.7.2.3
#5 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

Am Dienstag, den 22.03.2011, 15:11 +0000 schrieb Otavio Salvador:

Quoted 16 lines
---
 recipes/vlc/vlc_1.1.4.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/vlc/vlc_1.1.4.1.bb +1 -1
index 6d4b877..18297c9 100644
@@ -5,14 +5,14 @@
 
 require vlc.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 

recipes/vlc/vlc_1.1.4.1.bb line 18

Quoted 10 lines
recipes/vlc/vlc_1.1.4.1.bb +1 -1
 SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
 SRC_URI[sha256sum] = "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"
 
 # ffmpeg from git (library version => 52) is required
 # libtool-native must be >= 2.2.4
-DEPENDS += "libdvdcss libdvdread lua5.1-native"
+DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
 RDEPENDS_${PN} += "lua5.1"
 
 EXTRA_OECONF += "\

What kind of error do you get? The recipe build fine for me using angstrom-2010.x for MACHINE = "beagleboard".

Thanks,

Paul

#6 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

Quoted 2 lines · Paul Menzel

What kind of error do you get? The recipe build fine for me using angstrom-2010.x for MACHINE = "beagleboard".

It fails to find lua.h so probably you had it built due other dependency.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#7 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

Am Mittwoch, den 23.03.2011, 08:51 -0300 schrieb Otavio Salvador:

Quoted 6 lines
Quoted 2 lines · Paul Menzel

What kind of error do you get? The recipe build fine for me using angstrom-2010.x for MACHINE = "beagleboard".

It fails to find lua.h so probably you had it built due other dependency.

No, I made a clean build, i. e. rm -rf angstrom-dev. Please post your build configuration.

Thanks,

Paul

#8 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

Hello
I was going to fill a bugrepport on OE's bugzilla but as you are already speaking of vlc building issue..
It does not build for me neither : http://pastebin.com/raw.php?i=wK4Sxbv9
Thanks by advance.

Regards,

Sylvain (aka GarthPS)

2011/3/23 Paul Menzel <[email protected]>

Quoted 22 lines

Am Mittwoch, den 23.03.2011, 08:51 -0300 schrieb Otavio Salvador:

Quoted 6 lines
Quoted 2 lines · Paul Menzel

What kind of error do you get? The recipe build fine for me using angstrom-2010.x for MACHINE = "beagleboard".

It fails to find lua.h so probably you had it built due other dependency.

No, I made a clean build, i. e. rm -rf angstrom-dev. Please post your build configuration.

Thanks,

Paul

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

#9 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

2011/3/23 Sylvain Paré <[email protected]>:

Quoted 10 lines

Hello
I was going to fill a bugrepport on OE's bugzilla but as you are already speaking of vlc building issue..
It does not build for me neither : http://pastebin.com/raw.php?i=wK4Sxbv9
Thanks by advance.

Regards,

Sylvain (aka GarthPS)

We did discuss this on irc, and the issue seems to be that libliveMedia.a is probably a host lib.

Another issue that was noted was that OE_CONF says --enable-live555 (or something like that) but live555 is not in the DEPENDS. A quick glance over the recipe showed that there seem to be more things missing in DEPENDS (freetype, apache, png, ...)

Frans

Quoted 30 lines

2011/3/23 Paul Menzel <[email protected]>

Quoted 12 lines

Am Mittwoch, den 23.03.2011, 08:51 -0300 schrieb Otavio Salvador:

Quoted 6 lines
Quoted 2 lines · Paul Menzel

What kind of error do you get? The recipe build fine for me using angstrom-2010.x for MACHINE = "beagleboard".

It fails to find lua.h so probably you had it built due other dependency.

No, I made a clean build, i. e. rm -rf angstrom-dev. Please post your build configuration.

Quoted 10 lines

Thanks,

Paul

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

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

#10 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

Am Mittwoch, den 23.03.2011, 15:20 +0100 schrieb Frans Meulenbroeks:

Quoted 5 lines

2011/3/23 Sylvain Paré <[email protected]>:

Quoted 4 lines

Hello
I was going to fill a bugrepport on OE's bugzilla but as you are already speaking of vlc building issue..
It does not build for me neither : http://pastebin.com/raw.php?i=wK4Sxbv9

It build for me fine *again* with 2b952471. So please, Otavio and Sylvain, report you build configuration. I am using angstrom-2010.x for MACHINE = "beagleboard".

Quoted 7 lines

We did discuss this on irc, and the issue seems to be that libliveMedia.a is probably a host lib.

Another issue that was noted was that OE_CONF says --enable-live555 (or something like that) but live555 is not in the DEPENDS. A quick glance over the recipe showed that there seem to be more things missing in DEPENDS (freetype, apache, png, ...)

That could be and it should be fixed to not implicitly depend on something. But we should also figure out why it works for me and lua.h gets staged for me.

Thanks,

Paul

#11 lore raw

Re: [PATCH 4/4] vlc (1.1.4.1): depends on lua5.1

Hi Paul
Thanks for your attention.
Here my machine is "palmpre2" and building for SHR unstable. If I can help for something..
Grettings,
Sylvain

2011/3/23 Paul Menzel <[email protected]>

Quoted 36 lines

Am Mittwoch, den 23.03.2011, 15:20 +0100 schrieb Frans Meulenbroeks:

Quoted 3 lines

2011/3/23 Sylvain Paré <[email protected]>:

Quoted 2 lines

Hello
I was going to fill a bugrepport on OE's bugzilla but as you are

already

Quoted 2 lines
Quoted 2 lines

speaking of vlc building issue..
It does not build for me neither :

http://pastebin.com/raw.php?i=wK4Sxbv9

It build for me fine *again* with 2b952471. So please, Otavio and Sylvain, report you build configuration. I am using angstrom-2010.x for MACHINE = "beagleboard".

Quoted 7 lines

We did discuss this on irc, and the issue seems to be that libliveMedia.a is probably a host lib.

Another issue that was noted was that OE_CONF says --enable-live555 (or something like that) but live555 is not in the DEPENDS. A quick glance over the recipe showed that there seem to be more things missing in DEPENDS (freetype, apache, png, ...)

That could be and it should be fixed to not implicitly depend on something. But we should also figure out why it works for me and lua.h gets staged for me.

Thanks,

Paul

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