* [meta-multimedia][PATCH v2 0/3] update vlc to 2.1.2
@ 2014-02-26 5:39 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 1/3] libdvdcss: update to 1.2.13 Tim Orling
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Tim Orling @ 2014-02-26 5:39 UTC (permalink / raw)
To: openembedded-devel
From: Tim Orling <TicoTimo@gmail.com>
v2: Incorporating JaMa's comments
Tim Orling (3):
libdvdcss: update to 1.2.13
live555: update to 2013.04.30
vlc: update to 2.1.2
.../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
.../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
.../vlc/{libdvdcss_1.2.10.bb => libdvdcss_1.2.13.bb} | 5 ++---
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19 -------------------
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17 +++++++++++++++++
.../recipes-multimedia/live555/live555_20110314.bb | 10 ----------
.../recipes-multimedia/live555/live555_20130430.bb | 7 +++++++
8 files changed, 63 insertions(+), 35 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
rename meta-multimedia/recipes-multimedia/vlc/{libdvdcss_1.2.10.bb => libdvdcss_1.2.13.bb} (71%)
delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
delete mode 100644 meta-oe/recipes-multimedia/live555/live555_20110314.bb
create mode 100644 meta-oe/recipes-multimedia/live555/live555_20130430.bb
--
1.8.3.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [meta-multimedia][PATCH v2 1/3] libdvdcss: update to 1.2.13
2014-02-26 5:39 [meta-multimedia][PATCH v2 0/3] update vlc to 2.1.2 Tim Orling
@ 2014-02-26 5:39 ` Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 2/3] live555: update to 2013.04.30 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2 Tim Orling
2 siblings, 0 replies; 14+ messages in thread
From: Tim Orling @ 2014-02-26 5:39 UTC (permalink / raw)
To: openembedded-devel
From: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
.../vlc/{libdvdcss_1.2.10.bb => libdvdcss_1.2.13.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-multimedia/recipes-multimedia/vlc/{libdvdcss_1.2.10.bb => libdvdcss_1.2.13.bb} (71%)
diff --git a/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.10.bb b/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb
similarity index 71%
rename from meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
rename to meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb
index 1a0b7b8..1a316d3 100644
--- a/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb
@@ -1,7 +1,6 @@
DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r1"
SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2"
@@ -9,5 +8,5 @@ inherit autotools
EXTRA_OECONF = " --disable-doc "
-SRC_URI[md5sum] = "ebd5370b79ac5a83e5c61b24a214cf74"
-SRC_URI[sha256sum] = "2394a75013ab66b592d8c91d53529ede392bc9faee37fe279bd29b455eff2220"
+SRC_URI[md5sum] = "53cfc52a60a156763c425572e5179273"
+SRC_URI[sha256sum] = "84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [meta-multimedia][PATCH v2 2/3] live555: update to 2013.04.30
2014-02-26 5:39 [meta-multimedia][PATCH v2 0/3] update vlc to 2.1.2 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 1/3] libdvdcss: update to 1.2.13 Tim Orling
@ 2014-02-26 5:39 ` Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2 Tim Orling
2 siblings, 0 replies; 14+ messages in thread
From: Tim Orling @ 2014-02-26 5:39 UTC (permalink / raw)
To: openembedded-devel
From: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
meta-oe/recipes-multimedia/live555/live555_20110314.bb | 10 ----------
meta-oe/recipes-multimedia/live555/live555_20130430.bb | 7 +++++++
2 files changed, 7 insertions(+), 10 deletions(-)
delete mode 100644 meta-oe/recipes-multimedia/live555/live555_20110314.bb
create mode 100644 meta-oe/recipes-multimedia/live555/live555_20130430.bb
diff --git a/meta-oe/recipes-multimedia/live555/live555_20110314.bb b/meta-oe/recipes-multimedia/live555/live555_20110314.bb
deleted file mode 100644
index b1dbad2..0000000
--- a/meta-oe/recipes-multimedia/live555/live555_20110314.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require live555.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "ff65b2c598e970b4b6c8219a1811de00"
-SRC_URI[sha256sum] = "c6ce050a7f9f69901e6f7f81a6745c82d9419e3904a753b2d5db1139caaf6738"
-
-
diff --git a/meta-oe/recipes-multimedia/live555/live555_20130430.bb b/meta-oe/recipes-multimedia/live555/live555_20130430.bb
new file mode 100644
index 0000000..f83285c
--- /dev/null
+++ b/meta-oe/recipes-multimedia/live555/live555_20130430.bb
@@ -0,0 +1,7 @@
+require live555.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe"
+
+SRC_URI[md5sum] = "95533d91bd196e42fd748076dc244b09"
+SRC_URI[sha256sum] = "e549af608c9961d85cb647bc3b99804fec0fbaf5338c1b72d057558ae5cd2aea"
+
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-02-26 5:39 [meta-multimedia][PATCH v2 0/3] update vlc to 2.1.2 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 1/3] libdvdcss: update to 1.2.13 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 2/3] live555: update to 2013.04.30 Tim Orling
@ 2014-02-26 5:39 ` Tim Orling
2014-02-26 12:48 ` Walter Goossens
2014-03-05 17:56 ` Martin Jansa
2 siblings, 2 replies; 14+ messages in thread
From: Tim Orling @ 2014-02-26 5:39 UTC (permalink / raw)
To: openembedded-devel
From: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
.../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
.../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19 -------------------
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17 +++++++++++++++++
5 files changed, 54 insertions(+), 22 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
new file mode 100644
index 0000000..9f0e708
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
@@ -0,0 +1,13 @@
+Index: vlc-2.1.2/configure.ac
+===================================================================
+--- vlc-2.1.2.orig/configure.ac
++++ vlc-2.1.2/configure.ac
+@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+ AC_PRESERVE_HELP_ORDER
+
+-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
+ AC_CONFIG_HEADERS([config.h])
+
+ # Disable with "./configure --disable-silent-rules" or "make V=1"
diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
new file mode 100644
index 0000000..6d2a46f
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
@@ -0,0 +1,17 @@
+Index: vlc-2.1.2/src/input/subtitles.c
+===================================================================
+--- vlc-2.1.2.orig/src/input/subtitles.c
++++ vlc-2.1.2/src/input/subtitles.c
+@@ -44,6 +44,12 @@
+ #include "input_internal.h"
+
+ /**
++ * Drepper's alternative
++ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
++ */
++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
++
++/**
+ * We are not going to autodetect more subtitle files than this.
+ */
+ #define MAX_SUBTITLE_FILES 128
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 6400719..976c3bf 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -5,13 +5,13 @@ SECTION = "multimedia"
DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
inherit autotools gettext
ARM_INSTRUCTION_SET = "arm"
-DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
+DEPENDS += "libdvdcss libdvdread lua-native lua"
LEAD_SONAME = "libvlc.so.5"
@@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
FILES_libvlc = "${libdir}/lib*.so.*"
+FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
+
FILES_${PN} += "${bindir}/vlc \
${datadir}/applications \
${datadir}/vlc/ \
@@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
+PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
do_configure() {
cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
@@ -81,6 +84,7 @@ do_configure() {
cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
oe_runconf
rm config.log
- sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
+ #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
+ sed -i -e s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
}
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
deleted file mode 100644
index 368db59..0000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# This recipe packages vlc as a library as well, so qt4 dependencies
-# can be avoided when only the library is installed.
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
-
-require vlc.inc
-
-SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
-SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
-SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
-
-PR = "r4"
-
-# work around build failure
-EXTRA_OECONF += " --enable-libxml2=no"
-
-SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
-SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
-
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
new file mode 100644
index 0000000..a33f93f
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
@@ -0,0 +1,17 @@
+# This recipe packages vlc as a library as well, so qt4 dependencies
+# can be avoided when only the library is installed.
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+require vlc.inc
+
+# work around build failure
+EXTRA_OECONF += " --enable-libxml2=no"
+
+SRC_URI += "file://0001-enable-subdir-objects.patch \
+ file://0002-glibc-does-not-provide-strlcpy.patch \
+"
+
+SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
+SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
+
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2 Tim Orling
@ 2014-02-26 12:48 ` Walter Goossens
2014-02-27 17:18 ` Timothy Orling
2014-03-05 17:56 ` Martin Jansa
1 sibling, 1 reply; 14+ messages in thread
From: Walter Goossens @ 2014-02-26 12:48 UTC (permalink / raw)
To: openembedded-devel
Hi Tim,
I've been working on slimmed down version of this recipe for audio only
and I got stuck on the lua scripts being incorrectly compiled, have you
looked at the scripts for this recipe?
It's not entirely clear to me how (in)portable lua bytecode is as the
documentation seems inconclusive about this. It seems the word-size
should at least be the same, but I've also read the endianness should be
the same.
Anyway, I'm using an x86_64 machine to compile for a raspberry pi
(arm-le) and it doesn't work out of the box, and also when using a 32bit
lua compiler (as suggested
https://wiki.videolan.org/Win32Compile_Under_Fedora/#Install_32-bit_Lua)
I'll be trying your recipe soon but I fear it'll have the same problem.
Walter
On 02/26/14 06:39, Tim Orling wrote:
> From: Tim Orling <TicoTimo@gmail.com>
>
> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> ---
> .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
> .../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
> meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19 -------------------
> meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17 +++++++++++++++++
> 5 files changed, 54 insertions(+), 22 deletions(-)
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> new file mode 100644
> index 0000000..9f0e708
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> @@ -0,0 +1,13 @@
> +Index: vlc-2.1.2/configure.ac
> +===================================================================
> +--- vlc-2.1.2.orig/configure.ac
> ++++ vlc-2.1.2/configure.ac
> +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> + AC_CANONICAL_HOST
> + AC_PRESERVE_HELP_ORDER
> +
> +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> + AC_CONFIG_HEADERS([config.h])
> +
> + # Disable with "./configure --disable-silent-rules" or "make V=1"
> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> new file mode 100644
> index 0000000..6d2a46f
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> @@ -0,0 +1,17 @@
> +Index: vlc-2.1.2/src/input/subtitles.c
> +===================================================================
> +--- vlc-2.1.2.orig/src/input/subtitles.c
> ++++ vlc-2.1.2/src/input/subtitles.c
> +@@ -44,6 +44,12 @@
> + #include "input_internal.h"
> +
> + /**
> ++ * Drepper's alternative
> ++ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> ++ */
> ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
> ++
> ++/**
> + * We are not going to autodetect more subtitle files than this.
> + */
> + #define MAX_SUBTITLE_FILES 128
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 6400719..976c3bf 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -5,13 +5,13 @@ SECTION = "multimedia"
>
> DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
>
> -SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> +SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
>
> inherit autotools gettext
>
> ARM_INSTRUCTION_SET = "arm"
>
> -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> +DEPENDS += "libdvdcss libdvdread lua-native lua"
>
> LEAD_SONAME = "libvlc.so.5"
>
> @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
>
> FILES_libvlc = "${libdir}/lib*.so.*"
>
> +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> +
> FILES_${PN} += "${bindir}/vlc \
> ${datadir}/applications \
> ${datadir}/vlc/ \
> @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
> PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> +PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
>
> do_configure() {
> cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> @@ -81,6 +84,7 @@ do_configure() {
> cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> oe_runconf
> rm config.log
> - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> + sed -i -e s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
> }
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> deleted file mode 100644
> index 368db59..0000000
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -# This recipe packages vlc as a library as well, so qt4 dependencies
> -# can be avoided when only the library is installed.
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> -
> -require vlc.inc
> -
> -SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> -
> -PR = "r4"
> -
> -# work around build failure
> -EXTRA_OECONF += " --enable-libxml2=no"
> -
> -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> -SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> -
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> new file mode 100644
> index 0000000..a33f93f
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> @@ -0,0 +1,17 @@
> +# This recipe packages vlc as a library as well, so qt4 dependencies
> +# can be avoided when only the library is installed.
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> +
> +require vlc.inc
> +
> +# work around build failure
> +EXTRA_OECONF += " --enable-libxml2=no"
> +
> +SRC_URI += "file://0001-enable-subdir-objects.patch \
> + file://0002-glibc-does-not-provide-strlcpy.patch \
> +"
> +
> +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> +
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-02-26 12:48 ` Walter Goossens
@ 2014-02-27 17:18 ` Timothy Orling
2014-02-27 19:28 ` Walter Goossens
0 siblings, 1 reply; 14+ messages in thread
From: Timothy Orling @ 2014-02-27 17:18 UTC (permalink / raw)
To: openembedded-devel
On Feb 26, 2014, at 4:48 AM, Walter Goossens <waltergoossens@home.nl> wrote:
> Hi Tim,
>
> I've been working on slimmed down version of this recipe for audio only
> and I got stuck on the lua scripts being incorrectly compiled, have you
> looked at the scripts for this recipe?
> It's not entirely clear to me how (in)portable lua bytecode is as the
> documentation seems inconclusive about this. It seems the word-size
> should at least be the same, but I've also read the endianness should be
> the same.
> Anyway, I'm using an x86_64 machine to compile for a raspberry pi
> (arm-le) and it doesn't work out of the box, and also when using a 32bit
> lua compiler (as suggested
> https://wiki.videolan.org/Win32Compile_Under_Fedora/#Install_32-bit_Lua)
> I'll be trying your recipe soon but I fear it'll have the same problem.
>
I have not looked into the lua/scripts yet. I was just happy to get it to compile!
Any feedback is welcomed.
> Walter
>
> On 02/26/14 06:39, Tim Orling wrote:
>> From: Tim Orling <TicoTimo@gmail.com>
>>
>> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
>> ---
>> .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
>> .../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
>> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
>> meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19 -------------------
>> meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17 +++++++++++++++++
>> 5 files changed, 54 insertions(+), 22 deletions(-)
>> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
>> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
>> delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
>> create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>>
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
>> new file mode 100644
>> index 0000000..9f0e708
>> --- /dev/null
>> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
>> @@ -0,0 +1,13 @@
>> +Index: vlc-2.1.2/configure.ac
>> +===================================================================
>> +--- vlc-2.1.2.orig/configure.ac
>> ++++ vlc-2.1.2/configure.ac
>> +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
>> + AC_CANONICAL_HOST
>> + AC_PRESERVE_HELP_ORDER
>> +
>> +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
>> ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
>> + AC_CONFIG_HEADERS([config.h])
>> +
>> + # Disable with "./configure --disable-silent-rules" or "make V=1"
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
>> new file mode 100644
>> index 0000000..6d2a46f
>> --- /dev/null
>> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
>> @@ -0,0 +1,17 @@
>> +Index: vlc-2.1.2/src/input/subtitles.c
>> +===================================================================
>> +--- vlc-2.1.2.orig/src/input/subtitles.c
>> ++++ vlc-2.1.2/src/input/subtitles.c
>> +@@ -44,6 +44,12 @@
>> + #include "input_internal.h"
>> +
>> + /**
>> ++ * Drepper's alternative
>> ++ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
>> ++ */
>> ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
>> ++
>> ++/**
>> + * We are not going to autodetect more subtitle files than this.
>> + */
>> + #define MAX_SUBTITLE_FILES 128
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> index 6400719..976c3bf 100644
>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> @@ -5,13 +5,13 @@ SECTION = "multimedia"
>>
>> DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
>>
>> -SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
>> +SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
>>
>> inherit autotools gettext
>>
>> ARM_INSTRUCTION_SET = "arm"
>>
>> -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
>> +DEPENDS += "libdvdcss libdvdread lua-native lua"
>>
>> LEAD_SONAME = "libvlc.so.5"
>>
>> @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
>>
>> FILES_libvlc = "${libdir}/lib*.so.*"
>>
>> +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
>> +
>> FILES_${PN} += "${bindir}/vlc \
>> ${datadir}/applications \
>> ${datadir}/vlc/ \
>> @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
>> PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
>> PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
>> PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
>> +PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
>>
>> do_configure() {
>> cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
>> @@ -81,6 +84,7 @@ do_configure() {
>> cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
>> oe_runconf
>> rm config.log
>> - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
>> + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
>> sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
>> + sed -i -e s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
>> }
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
>> deleted file mode 100644
>> index 368db59..0000000
>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
>> +++ /dev/null
>> @@ -1,19 +0,0 @@
>> -# This recipe packages vlc as a library as well, so qt4 dependencies
>> -# can be avoided when only the library is installed.
>> -
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
>> -
>> -require vlc.inc
>> -
>> -SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
>> -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
>> -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
>> -
>> -PR = "r4"
>> -
>> -# work around build failure
>> -EXTRA_OECONF += " --enable-libxml2=no"
>> -
>> -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
>> -SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
>> -
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>> new file mode 100644
>> index 0000000..a33f93f
>> --- /dev/null
>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>> @@ -0,0 +1,17 @@
>> +# This recipe packages vlc as a library as well, so qt4 dependencies
>> +# can be avoided when only the library is installed.
>> +
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>> +
>> +require vlc.inc
>> +
>> +# work around build failure
>> +EXTRA_OECONF += " --enable-libxml2=no"
>> +
>> +SRC_URI += "file://0001-enable-subdir-objects.patch \
>> + file://0002-glibc-does-not-provide-strlcpy.patch \
>> +"
>> +
>> +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
>> +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
>> +
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--Tim
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-02-27 17:18 ` Timothy Orling
@ 2014-02-27 19:28 ` Walter Goossens
0 siblings, 0 replies; 14+ messages in thread
From: Walter Goossens @ 2014-02-27 19:28 UTC (permalink / raw)
To: openembedded-devel
On 02/27/14 18:18, Timothy Orling wrote:
> On Feb 26, 2014, at 4:48 AM, Walter Goossens <waltergoossens@home.nl> wrote:
>
>> Hi Tim,
>>
>> I've been working on slimmed down version of this recipe for audio only
>> and I got stuck on the lua scripts being incorrectly compiled, have you
>> looked at the scripts for this recipe?
>> It's not entirely clear to me how (in)portable lua bytecode is as the
>> documentation seems inconclusive about this. It seems the word-size
>> should at least be the same, but I've also read the endianness should be
>> the same.
>> Anyway, I'm using an x86_64 machine to compile for a raspberry pi
>> (arm-le) and it doesn't work out of the box, and also when using a 32bit
>> lua compiler (as suggested
>> https://wiki.videolan.org/Win32Compile_Under_Fedora/#Install_32-bit_Lua)
>> I'll be trying your recipe soon but I fear it'll have the same problem.
>>
> I have not looked into the lua/scripts yet. I was just happy to get it to compile!
>
> Any feedback is welcomed.
Well... to be quite honest, I haven't found a _real_ solution yet...
right now I create a script to compile the lua file on the target at
first boot but that really shouldn't be needed. There should be a way to
do decent lua cross-compiles but I have zero experience with lua, and
this error seemed so obvious to me that I'm still looking at what I've
done wrong. The llvm-lua stuff seems to be able to crosscompile but that
seemed like a hassle as well.
I was just wondering if compiling a lua script can be for the target
_really_ isn't possible and no-one has ever noticed or that I'm missing
something.
Keep you posted!
Walter
>> Walter
>>
>> On 02/26/14 06:39, Tim Orling wrote:
>>> From: Tim Orling <TicoTimo@gmail.com>
>>>
>>> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
>>> ---
>>> .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
>>> .../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
>>> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
>>> meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19 -------------------
>>> meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17 +++++++++++++++++
>>> 5 files changed, 54 insertions(+), 22 deletions(-)
>>> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
>>> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
>>> delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
>>> create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>>>
>>> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
>>> new file mode 100644
>>> index 0000000..9f0e708
>>> --- /dev/null
>>> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
>>> @@ -0,0 +1,13 @@
>>> +Index: vlc-2.1.2/configure.ac
>>> +===================================================================
>>> +--- vlc-2.1.2.orig/configure.ac
>>> ++++ vlc-2.1.2/configure.ac
>>> +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
>>> + AC_CANONICAL_HOST
>>> + AC_PRESERVE_HELP_ORDER
>>> +
>>> +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
>>> ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
>>> + AC_CONFIG_HEADERS([config.h])
>>> +
>>> + # Disable with "./configure --disable-silent-rules" or "make V=1"
>>> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
>>> new file mode 100644
>>> index 0000000..6d2a46f
>>> --- /dev/null
>>> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
>>> @@ -0,0 +1,17 @@
>>> +Index: vlc-2.1.2/src/input/subtitles.c
>>> +===================================================================
>>> +--- vlc-2.1.2.orig/src/input/subtitles.c
>>> ++++ vlc-2.1.2/src/input/subtitles.c
>>> +@@ -44,6 +44,12 @@
>>> + #include "input_internal.h"
>>> +
>>> + /**
>>> ++ * Drepper's alternative
>>> ++ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
>>> ++ */
>>> ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
>>> ++
>>> ++/**
>>> + * We are not going to autodetect more subtitle files than this.
>>> + */
>>> + #define MAX_SUBTITLE_FILES 128
>>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>>> index 6400719..976c3bf 100644
>>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>>> @@ -5,13 +5,13 @@ SECTION = "multimedia"
>>>
>>> DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
>>>
>>> -SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
>>> +SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
>>>
>>> inherit autotools gettext
>>>
>>> ARM_INSTRUCTION_SET = "arm"
>>>
>>> -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
>>> +DEPENDS += "libdvdcss libdvdread lua-native lua"
>>>
>>> LEAD_SONAME = "libvlc.so.5"
>>>
>>> @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
>>>
>>> FILES_libvlc = "${libdir}/lib*.so.*"
>>>
>>> +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
>>> +
>>> FILES_${PN} += "${bindir}/vlc \
>>> ${datadir}/applications \
>>> ${datadir}/vlc/ \
>>> @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
>>> PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
>>> PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
>>> PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
>>> +PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
>>>
>>> do_configure() {
>>> cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
>>> @@ -81,6 +84,7 @@ do_configure() {
>>> cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
>>> oe_runconf
>>> rm config.log
>>> - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
>>> + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
>>> sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
>>> + sed -i -e s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
>>> }
>>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
>>> deleted file mode 100644
>>> index 368db59..0000000
>>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
>>> +++ /dev/null
>>> @@ -1,19 +0,0 @@
>>> -# This recipe packages vlc as a library as well, so qt4 dependencies
>>> -# can be avoided when only the library is installed.
>>> -
>>> -LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
>>> -
>>> -require vlc.inc
>>> -
>>> -SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
>>> -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
>>> -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
>>> -
>>> -PR = "r4"
>>> -
>>> -# work around build failure
>>> -EXTRA_OECONF += " --enable-libxml2=no"
>>> -
>>> -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
>>> -SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
>>> -
>>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>>> new file mode 100644
>>> index 0000000..a33f93f
>>> --- /dev/null
>>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>>> @@ -0,0 +1,17 @@
>>> +# This recipe packages vlc as a library as well, so qt4 dependencies
>>> +# can be avoided when only the library is installed.
>>> +
>>> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>>> +
>>> +require vlc.inc
>>> +
>>> +# work around build failure
>>> +EXTRA_OECONF += " --enable-libxml2=no"
>>> +
>>> +SRC_URI += "file://0001-enable-subdir-objects.patch \
>>> + file://0002-glibc-does-not-provide-strlcpy.patch \
>>> +"
>>> +
>>> +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
>>> +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
>>> +
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --Tim
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2 Tim Orling
2014-02-26 12:48 ` Walter Goossens
@ 2014-03-05 17:56 ` Martin Jansa
2014-03-09 4:54 ` Tim Orling
1 sibling, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2014-03-05 17:56 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 10470 bytes --]
On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> From: Tim Orling <TicoTimo@gmail.com>
>
> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> ---
> .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
> .../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
> meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19 -------------------
> meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17 +++++++++++++++++
> 5 files changed, 54 insertions(+), 22 deletions(-)
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Hi,
it fails to build in world verification:
| make[1]: Entering directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
| Making all in compat
| make[2]: Entering directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
| make all-am
| make[3]: Entering directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
-mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
-std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
-pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
-Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-Wmissing-prototypes -Wvolatile-register-var
-Werror-implicit-function-declaration -pipe -fvisibility=hidden
-ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo dummy.c
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
-mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
-std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
-pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
-Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-Wmissing-prototypes -Wvolatile-register-var
-Werror-implicit-function-declaration -pipe -fvisibility=hidden
-ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
strlcpy.c
| ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
-march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
-std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall -Wextra
-Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
-Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
-Werror-implicit-function-declaration -pipe -fvisibility=hidden
-ffast-math -funroll-loops -fomit-frame-pointer -no-undefined -static
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la -rpath
/usr/lib/vlc dummy.lo strlcpy.lo
| ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool: not
found
| make[3]: *** [libcompat.la] Error 127
| make[3]: Leaving directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
| make[2]: *** [all] Error 2
| make[2]: Leaving directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
Can you please check? I'll send updated bitbake world status later today
or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_Status
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> new file mode 100644
> index 0000000..9f0e708
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> @@ -0,0 +1,13 @@
> +Index: vlc-2.1.2/configure.ac
> +===================================================================
> +--- vlc-2.1.2.orig/configure.ac
> ++++ vlc-2.1.2/configure.ac
> +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> + AC_CANONICAL_HOST
> + AC_PRESERVE_HELP_ORDER
> +
> +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> + AC_CONFIG_HEADERS([config.h])
> +
> + # Disable with "./configure --disable-silent-rules" or "make V=1"
> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> new file mode 100644
> index 0000000..6d2a46f
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> @@ -0,0 +1,17 @@
> +Index: vlc-2.1.2/src/input/subtitles.c
> +===================================================================
> +--- vlc-2.1.2.orig/src/input/subtitles.c
> ++++ vlc-2.1.2/src/input/subtitles.c
> +@@ -44,6 +44,12 @@
> + #include "input_internal.h"
> +
> + /**
> ++ * Drepper's alternative
> ++ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> ++ */
> ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
> ++
> ++/**
> + * We are not going to autodetect more subtitle files than this.
> + */
> + #define MAX_SUBTITLE_FILES 128
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 6400719..976c3bf 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -5,13 +5,13 @@ SECTION = "multimedia"
>
> DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
>
> -SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> +SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
>
> inherit autotools gettext
>
> ARM_INSTRUCTION_SET = "arm"
>
> -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> +DEPENDS += "libdvdcss libdvdread lua-native lua"
>
> LEAD_SONAME = "libvlc.so.5"
>
> @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
>
> FILES_libvlc = "${libdir}/lib*.so.*"
>
> +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> +
> FILES_${PN} += "${bindir}/vlc \
> ${datadir}/applications \
> ${datadir}/vlc/ \
> @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
> PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> +PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
>
> do_configure() {
> cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> @@ -81,6 +84,7 @@ do_configure() {
> cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> oe_runconf
> rm config.log
> - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> + sed -i -e s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
> }
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> deleted file mode 100644
> index 368db59..0000000
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -# This recipe packages vlc as a library as well, so qt4 dependencies
> -# can be avoided when only the library is installed.
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> -
> -require vlc.inc
> -
> -SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> -
> -PR = "r4"
> -
> -# work around build failure
> -EXTRA_OECONF += " --enable-libxml2=no"
> -
> -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> -SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> -
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> new file mode 100644
> index 0000000..a33f93f
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> @@ -0,0 +1,17 @@
> +# This recipe packages vlc as a library as well, so qt4 dependencies
> +# can be avoided when only the library is installed.
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> +
> +require vlc.inc
> +
> +# work around build failure
> +EXTRA_OECONF += " --enable-libxml2=no"
> +
> +SRC_URI += "file://0001-enable-subdir-objects.patch \
> + file://0002-glibc-does-not-provide-strlcpy.patch \
> +"
> +
> +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> +
> --
> 1.8.3.2
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-03-05 17:56 ` Martin Jansa
@ 2014-03-09 4:54 ` Tim Orling
2014-03-11 15:26 ` Martin Jansa
0 siblings, 1 reply; 14+ messages in thread
From: Tim Orling @ 2014-03-09 4:54 UTC (permalink / raw)
To: openembedded-devel
Can you check the build directory to see if
arm-nodistro-linux-gnueabi-libtool was created? I'm building in angstrom,
so I see arm-angstrom-linux-gnueabi-libtool... This was not being found by
the doltlibtool script, which was the reason for the sed fix in vlc.inc. I
suspect it is behaving differently in your environment. It's on my list to
duplicate your build environment, including jenkins, but I haven't done it
yet.
--Tim
On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> > From: Tim Orling <TicoTimo@gmail.com>
> >
> > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > ---
> > .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
> > .../files/0002-glibc-does-not-provide-strlcpy.patch | 17
> +++++++++++++++++
> > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
> > meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19
> -------------------
> > meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17
> +++++++++++++++++
> > 5 files changed, 54 insertions(+), 22 deletions(-)
> > create mode 100644
> meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > create mode 100644
> meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>
> Hi,
>
> it fails to build in world verification:
>
> | make[1]: Entering directory
>
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> | Making all in compat
> | make[2]: Entering directory
>
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> | make all-am
> | make[3]: Entering directory
>
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> -mthumb-interwork
>
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> -Wmissing-prototypes -Wvolatile-register-var
> -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> -ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo dummy.c
> | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> -mthumb-interwork
>
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> -Wmissing-prototypes -Wvolatile-register-var
> -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> -ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
> strlcpy.c
> | ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
> -march=armv5te -marm -mthumb-interwork
>
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> -std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
> -Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
> -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> -ffast-math -funroll-loops -fomit-frame-pointer -no-undefined -static
> -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la -rpath
> /usr/lib/vlc dummy.lo strlcpy.lo
> | ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool: not
> found
> | make[3]: *** [libcompat.la] Error 127
> | make[3]: Leaving directory
>
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> | make[2]: *** [all] Error 2
> | make[2]: Leaving directory
>
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> | make[1]: *** [all-recursive] Error 1
> | make[1]: Leaving directory
>
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> | make: *** [all] Error 2
> | ERROR: oe_runmake failed
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_compile (log file is located at
>
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
> NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
>
> Can you please check? I'll send updated bitbake world status later today
> or tomorrow (with full log)
> http://www.openembedded.org/wiki/Bitbake_World_Status
>
> >
> > diff --git
> a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > new file mode 100644
> > index 0000000..9f0e708
> > --- /dev/null
> > +++
> b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > @@ -0,0 +1,13 @@
> > +Index: vlc-2.1.2/configure.ac
> > +===================================================================
> > +--- vlc-2.1.2.orig/configure.ac
> > ++++ vlc-2.1.2/configure.ac
> > +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> > + AC_CANONICAL_HOST
> > + AC_PRESERVE_HELP_ORDER
> > +
> > +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> > ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> > + AC_CONFIG_HEADERS([config.h])
> > +
> > + # Disable with "./configure --disable-silent-rules" or "make V=1"
> > diff --git
> a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > new file mode 100644
> > index 0000000..6d2a46f
> > --- /dev/null
> > +++
> b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > @@ -0,0 +1,17 @@
> > +Index: vlc-2.1.2/src/input/subtitles.c
> > +===================================================================
> > +--- vlc-2.1.2.orig/src/input/subtitles.c
> > ++++ vlc-2.1.2/src/input/subtitles.c
> > +@@ -44,6 +44,12 @@
> > + #include "input_internal.h"
> > +
> > + /**
> > ++ * Drepper's alternative
> > ++ *
> http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> > ++ */
> > ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
> > ++
> > ++/**
> > + * We are not going to autodetect more subtitle files than this.
> > + */
> > + #define MAX_SUBTITLE_FILES 128
> > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > index 6400719..976c3bf 100644
> > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > @@ -5,13 +5,13 @@ SECTION = "multimedia"
> >
> > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl
> qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth
> alsa-lib"
> >
> > -SRC_URI = "
> http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> > +SRC_URI = "
> http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
> >
> > inherit autotools gettext
> >
> > ARM_INSTRUCTION_SET = "arm"
> >
> > -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> > +DEPENDS += "libdvdcss libdvdread lua-native lua"
> >
> > LEAD_SONAME = "libvlc.so.5"
> >
> > @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
> >
> > FILES_libvlc = "${libdir}/lib*.so.*"
> >
> > +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> > +
> > FILES_${PN} += "${bindir}/vlc \
> > ${datadir}/applications \
> > ${datadir}/vlc/ \
> > @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] =
> "--enable-id3tag,--disable-id3tag,libid3tag"
> > PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> > PACKAGECONFIG[mpeg2dec] =
> "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> > PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> > +PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
> >
> > do_configure() {
> > cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> > @@ -81,6 +84,7 @@ do_configure() {
> > cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> > oe_runconf
> > rm config.log
> > - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\
> -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> > + sed -i -e
> s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> doltlibtool
> > }
> > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
> vlc_1.1.11.bb
> > deleted file mode 100644
> > index 368db59..0000000
> > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > +++ /dev/null
> > @@ -1,19 +0,0 @@
> > -# This recipe packages vlc as a library as well, so qt4 dependencies
> > -# can be avoided when only the library is installed.
> > -
> > -LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> > -
> > -require vlc.inc
> > -
> > -SRC_URI +=
> "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> > -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> > -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> > -
> > -PR = "r4"
> > -
> > -# work around build failure
> > -EXTRA_OECONF += " --enable-libxml2=no"
> > -
> > -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> > -SRC_URI[sha256sum] =
> "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> > -
> > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
> vlc_2.1.2.bb
> > new file mode 100644
> > index 0000000..a33f93f
> > --- /dev/null
> > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> > @@ -0,0 +1,17 @@
> > +# This recipe packages vlc as a library as well, so qt4 dependencies
> > +# can be avoided when only the library is installed.
> > +
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > +
> > +require vlc.inc
> > +
> > +# work around build failure
> > +EXTRA_OECONF += " --enable-libxml2=no"
> > +
> > +SRC_URI += "file://0001-enable-subdir-objects.patch \
> > + file://0002-glibc-does-not-provide-strlcpy.patch \
> > +"
> > +
> > +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> > +SRC_URI[sha256sum] =
> "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> > +
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-03-09 4:54 ` Tim Orling
@ 2014-03-11 15:26 ` Martin Jansa
2014-03-12 15:13 ` Tim Orling
0 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2014-03-11 15:26 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 13833 bytes --]
On Sat, Mar 08, 2014 at 08:54:31PM -0800, Tim Orling wrote:
> Can you check the build directory to see if
> arm-nodistro-linux-gnueabi-libtool was created? I'm building in angstrom,
> so I see arm-angstrom-linux-gnueabi-libtool... This was not being found by
> the doltlibtool script, which was the reason for the sed fix in vlc.inc. I
> suspect it is behaving differently in your environment. It's on my list to
> duplicate your build environment, including jenkins, but I haven't done it
> yet.
It doesn't exist in WORKDIR
OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0
-name arm-nodistro-linux-gnueabi-libtool
or sysroot
OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
-name arm-nodistro-linux-gnueabi-libtool
only libtool I have is:
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolize
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtool
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtool
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolize
> > > + sed -i -e
> > s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > doltlibtool
I guess you should use ${TARGET_SYS}-libtool here.
Because TARGET_VENDOR != ${DISTRO}
I'll change it in master-next and check it in my build, please test it
in your angstrom build as well and let me know.
> --Tim
>
>
> On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> > On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> > > From: Tim Orling <TicoTimo@gmail.com>
> > >
> > > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > > ---
> > > .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
> > > .../files/0002-glibc-does-not-provide-strlcpy.patch | 17
> > +++++++++++++++++
> > > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++---
> > > meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19
> > -------------------
> > > meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17
> > +++++++++++++++++
> > > 5 files changed, 54 insertions(+), 22 deletions(-)
> > > create mode 100644
> > meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > create mode 100644
> > meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > > create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> >
> > Hi,
> >
> > it fails to build in world verification:
> >
> > | make[1]: Entering directory
> >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > | Making all in compat
> > | make[2]: Entering directory
> >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > | make all-am
> > | make[3]: Entering directory
> >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > -mthumb-interwork
> >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> > -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > -Wmissing-prototypes -Wvolatile-register-var
> > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > -ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo dummy.c
> > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > -mthumb-interwork
> >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> > -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > -Wmissing-prototypes -Wvolatile-register-var
> > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > -ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
> > strlcpy.c
> > | ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
> > -march=armv5te -marm -mthumb-interwork
> >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > -std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> > -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
> > -Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
> > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > -ffast-math -funroll-loops -fomit-frame-pointer -no-undefined -static
> > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la -rpath
> > /usr/lib/vlc dummy.lo strlcpy.lo
> > | ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool: not
> > found
> > | make[3]: *** [libcompat.la] Error 127
> > | make[3]: Leaving directory
> >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > | make[2]: *** [all] Error 2
> > | make[2]: Leaving directory
> >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > | make[1]: *** [all-recursive] Error 1
> > | make[1]: Leaving directory
> >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > | make: *** [all] Error 2
> > | ERROR: oe_runmake failed
> > | WARNING: exit code 1 from a shell command.
> > | ERROR: Function failed: do_compile (log file is located at
> >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
> > NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
> >
> > Can you please check? I'll send updated bitbake world status later today
> > or tomorrow (with full log)
> > http://www.openembedded.org/wiki/Bitbake_World_Status
> >
> > >
> > > diff --git
> > a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > new file mode 100644
> > > index 0000000..9f0e708
> > > --- /dev/null
> > > +++
> > b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > @@ -0,0 +1,13 @@
> > > +Index: vlc-2.1.2/configure.ac
> > > +===================================================================
> > > +--- vlc-2.1.2.orig/configure.ac
> > > ++++ vlc-2.1.2/configure.ac
> > > +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> > > + AC_CANONICAL_HOST
> > > + AC_PRESERVE_HELP_ORDER
> > > +
> > > +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> > > ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> > > + AC_CONFIG_HEADERS([config.h])
> > > +
> > > + # Disable with "./configure --disable-silent-rules" or "make V=1"
> > > diff --git
> > a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > new file mode 100644
> > > index 0000000..6d2a46f
> > > --- /dev/null
> > > +++
> > b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > @@ -0,0 +1,17 @@
> > > +Index: vlc-2.1.2/src/input/subtitles.c
> > > +===================================================================
> > > +--- vlc-2.1.2.orig/src/input/subtitles.c
> > > ++++ vlc-2.1.2/src/input/subtitles.c
> > > +@@ -44,6 +44,12 @@
> > > + #include "input_internal.h"
> > > +
> > > + /**
> > > ++ * Drepper's alternative
> > > ++ *
> > http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> > > ++ */
> > > ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
> > > ++
> > > ++/**
> > > + * We are not going to autodetect more subtitle files than this.
> > > + */
> > > + #define MAX_SUBTITLE_FILES 128
> > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > index 6400719..976c3bf 100644
> > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > @@ -5,13 +5,13 @@ SECTION = "multimedia"
> > >
> > > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl
> > qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth
> > alsa-lib"
> > >
> > > -SRC_URI = "
> > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> > > +SRC_URI = "
> > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
> > >
> > > inherit autotools gettext
> > >
> > > ARM_INSTRUCTION_SET = "arm"
> > >
> > > -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> > > +DEPENDS += "libdvdcss libdvdread lua-native lua"
> > >
> > > LEAD_SONAME = "libvlc.so.5"
> > >
> > > @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
> > >
> > > FILES_libvlc = "${libdir}/lib*.so.*"
> > >
> > > +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> > > +
> > > FILES_${PN} += "${bindir}/vlc \
> > > ${datadir}/applications \
> > > ${datadir}/vlc/ \
> > > @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] =
> > "--enable-id3tag,--disable-id3tag,libid3tag"
> > > PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> > > PACKAGECONFIG[mpeg2dec] =
> > "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> > > PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> > > +PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
> > >
> > > do_configure() {
> > > cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> > > @@ -81,6 +84,7 @@ do_configure() {
> > > cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> > > oe_runconf
> > > rm config.log
> > > - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\
> > -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> > > + sed -i -e
> > s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > doltlibtool
> > > }
> > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
> > vlc_1.1.11.bb
> > > deleted file mode 100644
> > > index 368db59..0000000
> > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > > +++ /dev/null
> > > @@ -1,19 +0,0 @@
> > > -# This recipe packages vlc as a library as well, so qt4 dependencies
> > > -# can be avoided when only the library is installed.
> > > -
> > > -LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> > > -
> > > -require vlc.inc
> > > -
> > > -SRC_URI +=
> > "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> > > -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> > > -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> > > -
> > > -PR = "r4"
> > > -
> > > -# work around build failure
> > > -EXTRA_OECONF += " --enable-libxml2=no"
> > > -
> > > -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> > > -SRC_URI[sha256sum] =
> > "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> > > -
> > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
> > vlc_2.1.2.bb
> > > new file mode 100644
> > > index 0000000..a33f93f
> > > --- /dev/null
> > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> > > @@ -0,0 +1,17 @@
> > > +# This recipe packages vlc as a library as well, so qt4 dependencies
> > > +# can be avoided when only the library is installed.
> > > +
> > > +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > +
> > > +require vlc.inc
> > > +
> > > +# work around build failure
> > > +EXTRA_OECONF += " --enable-libxml2=no"
> > > +
> > > +SRC_URI += "file://0001-enable-subdir-objects.patch \
> > > + file://0002-glibc-does-not-provide-strlcpy.patch \
> > > +"
> > > +
> > > +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> > > +SRC_URI[sha256sum] =
> > "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> > > +
> > > --
> > > 1.8.3.2
> > >
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> > _______________________________________________
> > 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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-03-11 15:26 ` Martin Jansa
@ 2014-03-12 15:13 ` Tim Orling
2014-03-12 21:12 ` Martin Jansa
0 siblings, 1 reply; 14+ messages in thread
From: Tim Orling @ 2014-03-12 15:13 UTC (permalink / raw)
To: openembedded-devel
Confirmed. That's what I "meant" to do in the first place.
I'll submit an updated patch within the next day or so.
On Tue, Mar 11, 2014 at 8:26 AM, Martin Jansa <martin.jansa@gmail.com>wrote:
> On Sat, Mar 08, 2014 at 08:54:31PM -0800, Tim Orling wrote:
> > Can you check the build directory to see if
> > arm-nodistro-linux-gnueabi-libtool was created? I'm building in angstrom,
> > so I see arm-angstrom-linux-gnueabi-libtool... This was not being found
> by
> > the doltlibtool script, which was the reason for the sed fix in vlc.inc.
> I
> > suspect it is behaving differently in your environment. It's on my list
> to
> > duplicate your build environment, including jenkins, but I haven't done
> it
> > yet.
>
> It doesn't exist in WORKDIR
> OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
>
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0
> -name arm-nodistro-linux-gnueabi-libtool
>
> or sysroot
>
> OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> -name arm-nodistro-linux-gnueabi-libtool
>
> only libtool I have is:
>
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolize
>
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtool
>
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtool
>
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolize
>
> > > > + sed -i -e
> > >
> s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > doltlibtool
>
> I guess you should use ${TARGET_SYS}-libtool here.
>
> Because TARGET_VENDOR != ${DISTRO}
>
> I'll change it in master-next and check it in my build, please test it
> in your angstrom build as well and let me know.
>
> > --Tim
> >
> >
> > On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >
> > > On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> > > > From: Tim Orling <TicoTimo@gmail.com>
> > > >
> > > > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > > > ---
> > > > .../vlc/files/0001-enable-subdir-objects.patch | 13
> +++++++++++++
> > > > .../files/0002-glibc-does-not-provide-strlcpy.patch | 17
> > > +++++++++++++++++
> > > > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10
> +++++++---
> > > > meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19
> > > -------------------
> > > > meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17
> > > +++++++++++++++++
> > > > 5 files changed, 54 insertions(+), 22 deletions(-)
> > > > create mode 100644
> > >
> meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > create mode 100644
> > >
> meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > delete mode 100644 meta-multimedia/recipes-multimedia/vlc/
> vlc_1.1.11.bb
> > > > create mode 100644 meta-multimedia/recipes-multimedia/vlc/
> vlc_2.1.2.bb
> > >
> > > Hi,
> > >
> > > it fails to build in world verification:
> > >
> > > | make[1]: Entering directory
> > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > | Making all in compat
> > > | make[2]: Entering directory
> > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > | make all-am
> > > | make[3]: Entering directory
> > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > -mthumb-interwork
> > >
> > >
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > -Wmissing-prototypes -Wvolatile-register-var
> > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo dummy.c
> > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > -mthumb-interwork
> > >
> > >
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > -Wmissing-prototypes -Wvolatile-register-var
> > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
> > > strlcpy.c
> > > | ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
> > > -march=armv5te -marm -mthumb-interwork
> > >
> > >
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > -std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> > > -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
> > > -Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
> > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > -ffast-math -funroll-loops -fomit-frame-pointer -no-undefined -static
> > > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la -rpath
> > > /usr/lib/vlc dummy.lo strlcpy.lo
> > > | ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool:
> not
> > > found
> > > | make[3]: *** [libcompat.la] Error 127
> > > | make[3]: Leaving directory
> > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > | make[2]: *** [all] Error 2
> > > | make[2]: Leaving directory
> > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > | make[1]: *** [all-recursive] Error 1
> > > | make[1]: Leaving directory
> > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > | make: *** [all] Error 2
> > > | ERROR: oe_runmake failed
> > > | WARNING: exit code 1 from a shell command.
> > > | ERROR: Function failed: do_compile (log file is located at
> > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
> > > NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
> > >
> > > Can you please check? I'll send updated bitbake world status later
> today
> > > or tomorrow (with full log)
> > > http://www.openembedded.org/wiki/Bitbake_World_Status
> > >
> > > >
> > > > diff --git
> > >
> a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > new file mode 100644
> > > > index 0000000..9f0e708
> > > > --- /dev/null
> > > > +++
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > @@ -0,0 +1,13 @@
> > > > +Index: vlc-2.1.2/configure.ac
> > > > +===================================================================
> > > > +--- vlc-2.1.2.orig/configure.ac
> > > > ++++ vlc-2.1.2/configure.ac
> > > > +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> > > > + AC_CANONICAL_HOST
> > > > + AC_PRESERVE_HELP_ORDER
> > > > +
> > > > +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> > > > ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> > > > + AC_CONFIG_HEADERS([config.h])
> > > > +
> > > > + # Disable with "./configure --disable-silent-rules" or "make V=1"
> > > > diff --git
> > >
> a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > new file mode 100644
> > > > index 0000000..6d2a46f
> > > > --- /dev/null
> > > > +++
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > @@ -0,0 +1,17 @@
> > > > +Index: vlc-2.1.2/src/input/subtitles.c
> > > > +===================================================================
> > > > +--- vlc-2.1.2.orig/src/input/subtitles.c
> > > > ++++ vlc-2.1.2/src/input/subtitles.c
> > > > +@@ -44,6 +44,12 @@
> > > > + #include "input_internal.h"
> > > > +
> > > > + /**
> > > > ++ * Drepper's alternative
> > > > ++ *
> > >
> http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> > > > ++ */
> > > > ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) =
> '\0'
> > > > ++
> > > > ++/**
> > > > + * We are not going to autodetect more subtitle files than this.
> > > > + */
> > > > + #define MAX_SUBTITLE_FILES 128
> > > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > index 6400719..976c3bf 100644
> > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > @@ -5,13 +5,13 @@ SECTION = "multimedia"
> > > >
> > > > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad
> virtual/libsdl
> > > qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
> fluidsynth
> > > alsa-lib"
> > > >
> > > > -SRC_URI = "
> > > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> > > > +SRC_URI = "
> > > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
> > > >
> > > > inherit autotools gettext
> > > >
> > > > ARM_INSTRUCTION_SET = "arm"
> > > >
> > > > -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> > > > +DEPENDS += "libdvdcss libdvdread lua-native lua"
> > > >
> > > > LEAD_SONAME = "libvlc.so.5"
> > > >
> > > > @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
> > > >
> > > > FILES_libvlc = "${libdir}/lib*.so.*"
> > > >
> > > > +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> > > > +
> > > > FILES_${PN} += "${bindir}/vlc \
> > > > ${datadir}/applications \
> > > > ${datadir}/vlc/ \
> > > > @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] =
> > > "--enable-id3tag,--disable-id3tag,libid3tag"
> > > > PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> > > > PACKAGECONFIG[mpeg2dec] =
> > > "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> > > > PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> > > > +PACKAGECONFIG[live555] =
> "--enable-live555,--disable-live555,live555"
> > > >
> > > > do_configure() {
> > > > cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> > > > @@ -81,6 +84,7 @@ do_configure() {
> > > > cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> > > > oe_runconf
> > > > rm config.log
> > > > - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\
> > > -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> > > > + sed -i -e
> > >
> s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > doltlibtool
> > > > }
> > > > diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > vlc_1.1.11.bb
> > > > deleted file mode 100644
> > > > index 368db59..0000000
> > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > > > +++ /dev/null
> > > > @@ -1,19 +0,0 @@
> > > > -# This recipe packages vlc as a library as well, so qt4 dependencies
> > > > -# can be avoided when only the library is installed.
> > > > -
> > > > -LIC_FILES_CHKSUM =
> "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> > > > -
> > > > -require vlc.inc
> > > > -
> > > > -SRC_URI +=
> > >
> "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> > > > -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> > > > -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> > > > -
> > > > -PR = "r4"
> > > > -
> > > > -# work around build failure
> > > > -EXTRA_OECONF += " --enable-libxml2=no"
> > > > -
> > > > -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> > > > -SRC_URI[sha256sum] =
> > > "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> > > > -
> > > > diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > vlc_2.1.2.bb
> > > > new file mode 100644
> > > > index 0000000..a33f93f
> > > > --- /dev/null
> > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> > > > @@ -0,0 +1,17 @@
> > > > +# This recipe packages vlc as a library as well, so qt4 dependencies
> > > > +# can be avoided when only the library is installed.
> > > > +
> > > > +LIC_FILES_CHKSUM =
> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > > +
> > > > +require vlc.inc
> > > > +
> > > > +# work around build failure
> > > > +EXTRA_OECONF += " --enable-libxml2=no"
> > > > +
> > > > +SRC_URI += "file://0001-enable-subdir-objects.patch \
> > > > + file://0002-glibc-does-not-provide-strlcpy.patch \
> > > > +"
> > > > +
> > > > +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> > > > +SRC_URI[sha256sum] =
> > > "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> > > > +
> > > > --
> > > > 1.8.3.2
> > > >
> > > > _______________________________________________
> > > > Openembedded-devel mailing list
> > > > Openembedded-devel@lists.openembedded.org
> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > >
> > > --
> > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > >
> > > _______________________________________________
> > > 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
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-03-12 15:13 ` Tim Orling
@ 2014-03-12 21:12 ` Martin Jansa
2014-03-12 22:32 ` Tim Orling
0 siblings, 1 reply; 14+ messages in thread
From: Martin Jansa @ 2014-03-12 21:12 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 16663 bytes --]
On Wed, Mar 12, 2014 at 08:13:45AM -0700, Tim Orling wrote:
> Confirmed. That's what I "meant" to do in the first place.
>
> I'll submit an updated patch within the next day or so.
It worked, but in the end vlc shows a lot of new QA issues:
vlc-2.1.2: non -staticdev package contains static .a library: vlc path
'/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/packages-split/vlc/usr/lib/vlc/plugins/lua/liblua_plugin.a'
vlc-2.1.2: non -staticdev package contains static .a library: vlc path
'/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/packages-split/vlc/usr/lib/vlc/plugins/arm_neon/libyuv_rgb_neon_plugin.a'
~ 100 more
Can you please update packaging or if they are needed then add
INSANE_SKIP to hide QA message.
Thanks
> On Tue, Mar 11, 2014 at 8:26 AM, Martin Jansa <martin.jansa@gmail.com>wrote:
>
> > On Sat, Mar 08, 2014 at 08:54:31PM -0800, Tim Orling wrote:
> > > Can you check the build directory to see if
> > > arm-nodistro-linux-gnueabi-libtool was created? I'm building in angstrom,
> > > so I see arm-angstrom-linux-gnueabi-libtool... This was not being found
> > by
> > > the doltlibtool script, which was the reason for the sed fix in vlc.inc.
> > I
> > > suspect it is behaving differently in your environment. It's on my list
> > to
> > > duplicate your build environment, including jenkins, but I haven't done
> > it
> > > yet.
> >
> > It doesn't exist in WORKDIR
> > OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0
> > -name arm-nodistro-linux-gnueabi-libtool
> >
> > or sysroot
> >
> > OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > -name arm-nodistro-linux-gnueabi-libtool
> >
> > only libtool I have is:
> >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolize
> >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtool
> >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtool
> >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolize
> >
> > > > > + sed -i -e
> > > >
> > s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > > doltlibtool
> >
> > I guess you should use ${TARGET_SYS}-libtool here.
> >
> > Because TARGET_VENDOR != ${DISTRO}
> >
> > I'll change it in master-next and check it in my build, please test it
> > in your angstrom build as well and let me know.
> >
> > > --Tim
> > >
> > >
> > > On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <martin.jansa@gmail.com>
> > wrote:
> > >
> > > > On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> > > > > From: Tim Orling <TicoTimo@gmail.com>
> > > > >
> > > > > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > > > > ---
> > > > > .../vlc/files/0001-enable-subdir-objects.patch | 13
> > +++++++++++++
> > > > > .../files/0002-glibc-does-not-provide-strlcpy.patch | 17
> > > > +++++++++++++++++
> > > > > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10
> > +++++++---
> > > > > meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19
> > > > -------------------
> > > > > meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17
> > > > +++++++++++++++++
> > > > > 5 files changed, 54 insertions(+), 22 deletions(-)
> > > > > create mode 100644
> > > >
> > meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > create mode 100644
> > > >
> > meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > delete mode 100644 meta-multimedia/recipes-multimedia/vlc/
> > vlc_1.1.11.bb
> > > > > create mode 100644 meta-multimedia/recipes-multimedia/vlc/
> > vlc_2.1.2.bb
> > > >
> > > > Hi,
> > > >
> > > > it fails to build in world verification:
> > > >
> > > > | make[1]: Entering directory
> > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > > | Making all in compat
> > > > | make[2]: Entering directory
> > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > | make all-am
> > > > | make[3]: Entering directory
> > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > > -mthumb-interwork
> > > >
> > > >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> > > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> > > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > > -Wmissing-prototypes -Wvolatile-register-var
> > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo dummy.c
> > > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > > -mthumb-interwork
> > > >
> > > >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -O2
> > > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra -Wsign-compare
> > > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > > -Wmissing-prototypes -Wvolatile-register-var
> > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
> > > > strlcpy.c
> > > > | ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
> > > > -march=armv5te -marm -mthumb-interwork
> > > >
> > > >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > -std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> > > > -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
> > > > -Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
> > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > -ffast-math -funroll-loops -fomit-frame-pointer -no-undefined -static
> > > > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la -rpath
> > > > /usr/lib/vlc dummy.lo strlcpy.lo
> > > > | ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool:
> > not
> > > > found
> > > > | make[3]: *** [libcompat.la] Error 127
> > > > | make[3]: Leaving directory
> > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > | make[2]: *** [all] Error 2
> > > > | make[2]: Leaving directory
> > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > | make[1]: *** [all-recursive] Error 1
> > > > | make[1]: Leaving directory
> > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > > | make: *** [all] Error 2
> > > > | ERROR: oe_runmake failed
> > > > | WARNING: exit code 1 from a shell command.
> > > > | ERROR: Function failed: do_compile (log file is located at
> > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
> > > > NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
> > > >
> > > > Can you please check? I'll send updated bitbake world status later
> > today
> > > > or tomorrow (with full log)
> > > > http://www.openembedded.org/wiki/Bitbake_World_Status
> > > >
> > > > >
> > > > > diff --git
> > > >
> > a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > new file mode 100644
> > > > > index 0000000..9f0e708
> > > > > --- /dev/null
> > > > > +++
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > @@ -0,0 +1,13 @@
> > > > > +Index: vlc-2.1.2/configure.ac
> > > > > +===================================================================
> > > > > +--- vlc-2.1.2.orig/configure.ac
> > > > > ++++ vlc-2.1.2/configure.ac
> > > > > +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> > > > > + AC_CANONICAL_HOST
> > > > > + AC_PRESERVE_HELP_ORDER
> > > > > +
> > > > > +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> > > > > ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> > > > > + AC_CONFIG_HEADERS([config.h])
> > > > > +
> > > > > + # Disable with "./configure --disable-silent-rules" or "make V=1"
> > > > > diff --git
> > > >
> > a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > new file mode 100644
> > > > > index 0000000..6d2a46f
> > > > > --- /dev/null
> > > > > +++
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > @@ -0,0 +1,17 @@
> > > > > +Index: vlc-2.1.2/src/input/subtitles.c
> > > > > +===================================================================
> > > > > +--- vlc-2.1.2.orig/src/input/subtitles.c
> > > > > ++++ vlc-2.1.2/src/input/subtitles.c
> > > > > +@@ -44,6 +44,12 @@
> > > > > + #include "input_internal.h"
> > > > > +
> > > > > + /**
> > > > > ++ * Drepper's alternative
> > > > > ++ *
> > > >
> > http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> > > > > ++ */
> > > > > ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) =
> > '\0'
> > > > > ++
> > > > > ++/**
> > > > > + * We are not going to autodetect more subtitle files than this.
> > > > > + */
> > > > > + #define MAX_SUBTITLE_FILES 128
> > > > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > index 6400719..976c3bf 100644
> > > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > @@ -5,13 +5,13 @@ SECTION = "multimedia"
> > > > >
> > > > > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad
> > virtual/libsdl
> > > > qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
> > fluidsynth
> > > > alsa-lib"
> > > > >
> > > > > -SRC_URI = "
> > > > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> > > > > +SRC_URI = "
> > > > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
> > > > >
> > > > > inherit autotools gettext
> > > > >
> > > > > ARM_INSTRUCTION_SET = "arm"
> > > > >
> > > > > -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> > > > > +DEPENDS += "libdvdcss libdvdread lua-native lua"
> > > > >
> > > > > LEAD_SONAME = "libvlc.so.5"
> > > > >
> > > > > @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
> > > > >
> > > > > FILES_libvlc = "${libdir}/lib*.so.*"
> > > > >
> > > > > +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> > > > > +
> > > > > FILES_${PN} += "${bindir}/vlc \
> > > > > ${datadir}/applications \
> > > > > ${datadir}/vlc/ \
> > > > > @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] =
> > > > "--enable-id3tag,--disable-id3tag,libid3tag"
> > > > > PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> > > > > PACKAGECONFIG[mpeg2dec] =
> > > > "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> > > > > PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> > > > > +PACKAGECONFIG[live555] =
> > "--enable-live555,--disable-live555,live555"
> > > > >
> > > > > do_configure() {
> > > > > cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> > > > > @@ -81,6 +84,7 @@ do_configure() {
> > > > > cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> > > > > oe_runconf
> > > > > rm config.log
> > > > > - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > > + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > > sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\
> > > > -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> > > > > + sed -i -e
> > > >
> > s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > > doltlibtool
> > > > > }
> > > > > diff --git
> > a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > > vlc_1.1.11.bb
> > > > > deleted file mode 100644
> > > > > index 368db59..0000000
> > > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > > > > +++ /dev/null
> > > > > @@ -1,19 +0,0 @@
> > > > > -# This recipe packages vlc as a library as well, so qt4 dependencies
> > > > > -# can be avoided when only the library is installed.
> > > > > -
> > > > > -LIC_FILES_CHKSUM =
> > "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> > > > > -
> > > > > -require vlc.inc
> > > > > -
> > > > > -SRC_URI +=
> > > >
> > "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> > > > > -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> > > > > -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> > > > > -
> > > > > -PR = "r4"
> > > > > -
> > > > > -# work around build failure
> > > > > -EXTRA_OECONF += " --enable-libxml2=no"
> > > > > -
> > > > > -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> > > > > -SRC_URI[sha256sum] =
> > > > "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> > > > > -
> > > > > diff --git
> > a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > > vlc_2.1.2.bb
> > > > > new file mode 100644
> > > > > index 0000000..a33f93f
> > > > > --- /dev/null
> > > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> > > > > @@ -0,0 +1,17 @@
> > > > > +# This recipe packages vlc as a library as well, so qt4 dependencies
> > > > > +# can be avoided when only the library is installed.
> > > > > +
> > > > > +LIC_FILES_CHKSUM =
> > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > > > +
> > > > > +require vlc.inc
> > > > > +
> > > > > +# work around build failure
> > > > > +EXTRA_OECONF += " --enable-libxml2=no"
> > > > > +
> > > > > +SRC_URI += "file://0001-enable-subdir-objects.patch \
> > > > > + file://0002-glibc-does-not-provide-strlcpy.patch \
> > > > > +"
> > > > > +
> > > > > +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> > > > > +SRC_URI[sha256sum] =
> > > > "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> > > > > +
> > > > > --
> > > > > 1.8.3.2
> > > > >
> > > > > _______________________________________________
> > > > > Openembedded-devel mailing list
> > > > > Openembedded-devel@lists.openembedded.org
> > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > > >
> > > > --
> > > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > > >
> > > > _______________________________________________
> > > > 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
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> > --
> > _______________________________________________
> > 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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-03-12 21:12 ` Martin Jansa
@ 2014-03-12 22:32 ` Tim Orling
2014-03-15 14:51 ` Martin Jansa
0 siblings, 1 reply; 14+ messages in thread
From: Tim Orling @ 2014-03-12 22:32 UTC (permalink / raw)
To: openembedded-devel
I made the mistake of doing FILES_libvlc-staticdev when I should have used
FILES_${PN}-staticdev. I will fix in the patch.
On Wed, Mar 12, 2014 at 2:12 PM, Martin Jansa <martin.jansa@gmail.com>wrote:
> On Wed, Mar 12, 2014 at 08:13:45AM -0700, Tim Orling wrote:
> > Confirmed. That's what I "meant" to do in the first place.
> >
> > I'll submit an updated patch within the next day or so.
>
> It worked, but in the end vlc shows a lot of new QA issues:
>
> vlc-2.1.2: non -staticdev package contains static .a library: vlc path
>
> '/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/packages-split/vlc/usr/lib/vlc/plugins/lua/liblua_plugin.a'
>
> vlc-2.1.2: non -staticdev package contains static .a library: vlc path
>
> '/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/packages-split/vlc/usr/lib/vlc/plugins/arm_neon/libyuv_rgb_neon_plugin.a'
>
> ~ 100 more
>
> Can you please update packaging or if they are needed then add
> INSANE_SKIP to hide QA message.
>
> Thanks
>
> > On Tue, Mar 11, 2014 at 8:26 AM, Martin Jansa <martin.jansa@gmail.com
> >wrote:
> >
> > > On Sat, Mar 08, 2014 at 08:54:31PM -0800, Tim Orling wrote:
> > > > Can you check the build directory to see if
> > > > arm-nodistro-linux-gnueabi-libtool was created? I'm building in
> angstrom,
> > > > so I see arm-angstrom-linux-gnueabi-libtool... This was not being
> found
> > > by
> > > > the doltlibtool script, which was the reason for the sed fix in
> vlc.inc.
> > > I
> > > > suspect it is behaving differently in your environment. It's on my
> list
> > > to
> > > > duplicate your build environment, including jenkins, but I haven't
> done
> > > it
> > > > yet.
> > >
> > > It doesn't exist in WORKDIR
> > > OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0
> > > -name arm-nodistro-linux-gnueabi-libtool
> > >
> > > or sysroot
> > >
> > > OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> > > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > -name arm-nodistro-linux-gnueabi-libtool
> > >
> > > only libtool I have is:
> > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolize
> > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtool
> > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtool
> > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolize
> > >
> > > > > > + sed -i -e
> > > > >
> > >
> s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > > > doltlibtool
> > >
> > > I guess you should use ${TARGET_SYS}-libtool here.
> > >
> > > Because TARGET_VENDOR != ${DISTRO}
> > >
> > > I'll change it in master-next and check it in my build, please test it
> > > in your angstrom build as well and let me know.
> > >
> > > > --Tim
> > > >
> > > >
> > > > On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <martin.jansa@gmail.com
> >
> > > wrote:
> > > >
> > > > > On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> > > > > > From: Tim Orling <TicoTimo@gmail.com>
> > > > > >
> > > > > > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > > > > > ---
> > > > > > .../vlc/files/0001-enable-subdir-objects.patch | 13
> > > +++++++++++++
> > > > > > .../files/0002-glibc-does-not-provide-strlcpy.patch | 17
> > > > > +++++++++++++++++
> > > > > > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10
> > > +++++++---
> > > > > > meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19
> > > > > -------------------
> > > > > > meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17
> > > > > +++++++++++++++++
> > > > > > 5 files changed, 54 insertions(+), 22 deletions(-)
> > > > > > create mode 100644
> > > > >
> > >
> meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > > create mode 100644
> > > > >
> > >
> meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > > delete mode 100644 meta-multimedia/recipes-multimedia/vlc/
> > > vlc_1.1.11.bb
> > > > > > create mode 100644 meta-multimedia/recipes-multimedia/vlc/
> > > vlc_2.1.2.bb
> > > > >
> > > > > Hi,
> > > > >
> > > > > it fails to build in world verification:
> > > > >
> > > > > | make[1]: Entering directory
> > > > >
> > > > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > > > | Making all in compat
> > > > > | make[2]: Entering directory
> > > > >
> > > > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > | make all-am
> > > > > | make[3]: Entering directory
> > > > >
> > > > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > > > -mthumb-interwork
> > > > >
> > > > >
> > >
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
> -O2
> > > > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> -Wsign-compare
> > > > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > > > -Wmissing-prototypes -Wvolatile-register-var
> > > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo
> dummy.c
> > > > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > > > -mthumb-interwork
> > > > >
> > > > >
> > >
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
> -O2
> > > > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> -Wsign-compare
> > > > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > > > -Wmissing-prototypes -Wvolatile-register-var
> > > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
> > > > > strlcpy.c
> > > > > | ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
> > > > > -march=armv5te -marm -mthumb-interwork
> > > > >
> > > > >
> > >
> --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > > -std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall
> -Wextra
> > > > > -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
> > > > > -Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
> > > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > > -ffast-math -funroll-loops -fomit-frame-pointer -no-undefined
> -static
> > > > > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la-rpath
> > > > > /usr/lib/vlc dummy.lo strlcpy.lo
> > > > > | ../doltlibtool: line 18: exec:
> arm-nodistro-linux-gnueabi-libtool:
> > > not
> > > > > found
> > > > > | make[3]: *** [libcompat.la] Error 127
> > > > > | make[3]: Leaving directory
> > > > >
> > > > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > | make[2]: *** [all] Error 2
> > > > > | make[2]: Leaving directory
> > > > >
> > > > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > | make[1]: *** [all-recursive] Error 1
> > > > > | make[1]: Leaving directory
> > > > >
> > > > >
> > >
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > > > | make: *** [all] Error 2
> > > > > | ERROR: oe_runmake failed
> > > > > | WARNING: exit code 1 from a shell command.
> > > > > | ERROR: Function failed: do_compile (log file is located at
> > > > >
> > > > >
> > >
> /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
> > > > > NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
> > > > >
> > > > > Can you please check? I'll send updated bitbake world status later
> > > today
> > > > > or tomorrow (with full log)
> > > > > http://www.openembedded.org/wiki/Bitbake_World_Status
> > > > >
> > > > > >
> > > > > > diff --git
> > > > >
> > >
> a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > >
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > > new file mode 100644
> > > > > > index 0000000..9f0e708
> > > > > > --- /dev/null
> > > > > > +++
> > > > >
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > > @@ -0,0 +1,13 @@
> > > > > > +Index: vlc-2.1.2/configure.ac
> > > > > >
> +===================================================================
> > > > > > +--- vlc-2.1.2.orig/configure.ac
> > > > > > ++++ vlc-2.1.2/configure.ac
> > > > > > +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> > > > > > + AC_CANONICAL_HOST
> > > > > > + AC_PRESERVE_HELP_ORDER
> > > > > > +
> > > > > > +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> > > > > > ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> > > > > > + AC_CONFIG_HEADERS([config.h])
> > > > > > +
> > > > > > + # Disable with "./configure --disable-silent-rules" or "make
> V=1"
> > > > > > diff --git
> > > > >
> > >
> a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > >
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > > new file mode 100644
> > > > > > index 0000000..6d2a46f
> > > > > > --- /dev/null
> > > > > > +++
> > > > >
> > >
> b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > > @@ -0,0 +1,17 @@
> > > > > > +Index: vlc-2.1.2/src/input/subtitles.c
> > > > > >
> +===================================================================
> > > > > > +--- vlc-2.1.2.orig/src/input/subtitles.c
> > > > > > ++++ vlc-2.1.2/src/input/subtitles.c
> > > > > > +@@ -44,6 +44,12 @@
> > > > > > + #include "input_internal.h"
> > > > > > +
> > > > > > + /**
> > > > > > ++ * Drepper's alternative
> > > > > > ++ *
> > > > >
> > >
> http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> > > > > > ++ */
> > > > > > ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) =
> > > '\0'
> > > > > > ++
> > > > > > ++/**
> > > > > > + * We are not going to autodetect more subtitle files than
> this.
> > > > > > + */
> > > > > > + #define MAX_SUBTITLE_FILES 128
> > > > > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > index 6400719..976c3bf 100644
> > > > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > @@ -5,13 +5,13 @@ SECTION = "multimedia"
> > > > > >
> > > > > > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad
> > > virtual/libsdl
> > > > > qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
> > > fluidsynth
> > > > > alsa-lib"
> > > > > >
> > > > > > -SRC_URI = "
> > > > >
> http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> > > > > > +SRC_URI = "
> > > > >
> http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
> > > > > >
> > > > > > inherit autotools gettext
> > > > > >
> > > > > > ARM_INSTRUCTION_SET = "arm"
> > > > > >
> > > > > > -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> > > > > > +DEPENDS += "libdvdcss libdvdread lua-native lua"
> > > > > >
> > > > > > LEAD_SONAME = "libvlc.so.5"
> > > > > >
> > > > > > @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
> > > > > >
> > > > > > FILES_libvlc = "${libdir}/lib*.so.*"
> > > > > >
> > > > > > +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> > > > > > +
> > > > > > FILES_${PN} += "${bindir}/vlc \
> > > > > > ${datadir}/applications \
> > > > > > ${datadir}/vlc/ \
> > > > > > @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] =
> > > > > "--enable-id3tag,--disable-id3tag,libid3tag"
> > > > > > PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> > > > > > PACKAGECONFIG[mpeg2dec] =
> > > > > "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> > > > > > PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> > > > > > +PACKAGECONFIG[live555] =
> > > "--enable-live555,--disable-live555,live555"
> > > > > >
> > > > > > do_configure() {
> > > > > > cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> > > > > > @@ -81,6 +84,7 @@ do_configure() {
> > > > > > cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ ||
> true
> > > > > > oe_runconf
> > > > > > rm config.log
> > > > > > - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > > > + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > > > sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\
> > > > > -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> > > > > > + sed -i -e
> > > > >
> > >
> s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > > > doltlibtool
> > > > > > }
> > > > > > diff --git
> > >
> a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > > > vlc_1.1.11.bb
> > > > > > deleted file mode 100644
> > > > > > index 368db59..0000000
> > > > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > > > > > +++ /dev/null
> > > > > > @@ -1,19 +0,0 @@
> > > > > > -# This recipe packages vlc as a library as well, so qt4
> dependencies
> > > > > > -# can be avoided when only the library is installed.
> > > > > > -
> > > > > > -LIC_FILES_CHKSUM =
> > > "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> > > > > > -
> > > > > > -require vlc.inc
> > > > > > -
> > > > > > -SRC_URI +=
> > > > >
> > >
> "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> > > > > > -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> > > > > > -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> > > > > > -
> > > > > > -PR = "r4"
> > > > > > -
> > > > > > -# work around build failure
> > > > > > -EXTRA_OECONF += " --enable-libxml2=no"
> > > > > > -
> > > > > > -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> > > > > > -SRC_URI[sha256sum] =
> > > > > "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> > > > > > -
> > > > > > diff --git
> > >
> a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > > > vlc_2.1.2.bb
> > > > > > new file mode 100644
> > > > > > index 0000000..a33f93f
> > > > > > --- /dev/null
> > > > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> > > > > > @@ -0,0 +1,17 @@
> > > > > > +# This recipe packages vlc as a library as well, so qt4
> dependencies
> > > > > > +# can be avoided when only the library is installed.
> > > > > > +
> > > > > > +LIC_FILES_CHKSUM =
> > > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > > > > +
> > > > > > +require vlc.inc
> > > > > > +
> > > > > > +# work around build failure
> > > > > > +EXTRA_OECONF += " --enable-libxml2=no"
> > > > > > +
> > > > > > +SRC_URI += "file://0001-enable-subdir-objects.patch \
> > > > > > + file://0002-glibc-does-not-provide-strlcpy.patch \
> > > > > > +"
> > > > > > +
> > > > > > +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> > > > > > +SRC_URI[sha256sum] =
> > > > > "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> > > > > > +
> > > > > > --
> > > > > > 1.8.3.2
> > > > > >
> > > > > > _______________________________________________
> > > > > > Openembedded-devel mailing list
> > > > > > Openembedded-devel@lists.openembedded.org
> > > > > >
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > > > >
> > > > > --
> > > > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > > > >
> > > > > _______________________________________________
> > > > > 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
> > >
> > > --
> > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > >
> > > --
> > > _______________________________________________
> > > 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
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
2014-03-12 22:32 ` Tim Orling
@ 2014-03-15 14:51 ` Martin Jansa
0 siblings, 0 replies; 14+ messages in thread
From: Martin Jansa @ 2014-03-15 14:51 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 19516 bytes --]
On Wed, Mar 12, 2014 at 03:32:47PM -0700, Tim Orling wrote:
> I made the mistake of doing FILES_libvlc-staticdev when I should have used
> FILES_${PN}-staticdev. I will fix in the patch.
I've updated it in master-next, please check it there.
1) removed .patch files not used in new version
2) renamed files -> vlc for faster lookup
3) updated packaging
4) smaller cleanups
> On Wed, Mar 12, 2014 at 2:12 PM, Martin Jansa <martin.jansa@gmail.com>wrote:
>
> > On Wed, Mar 12, 2014 at 08:13:45AM -0700, Tim Orling wrote:
> > > Confirmed. That's what I "meant" to do in the first place.
> > >
> > > I'll submit an updated patch within the next day or so.
> >
> > It worked, but in the end vlc shows a lot of new QA issues:
> >
> > vlc-2.1.2: non -staticdev package contains static .a library: vlc path
> >
> > '/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/packages-split/vlc/usr/lib/vlc/plugins/lua/liblua_plugin.a'
> >
> > vlc-2.1.2: non -staticdev package contains static .a library: vlc path
> >
> > '/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/packages-split/vlc/usr/lib/vlc/plugins/arm_neon/libyuv_rgb_neon_plugin.a'
> >
> > ~ 100 more
> >
> > Can you please update packaging or if they are needed then add
> > INSANE_SKIP to hide QA message.
> >
> > Thanks
> >
> > > On Tue, Mar 11, 2014 at 8:26 AM, Martin Jansa <martin.jansa@gmail.com
> > >wrote:
> > >
> > > > On Sat, Mar 08, 2014 at 08:54:31PM -0800, Tim Orling wrote:
> > > > > Can you check the build directory to see if
> > > > > arm-nodistro-linux-gnueabi-libtool was created? I'm building in
> > angstrom,
> > > > > so I see arm-angstrom-linux-gnueabi-libtool... This was not being
> > found
> > > > by
> > > > > the doltlibtool script, which was the reason for the sed fix in
> > vlc.inc.
> > > > I
> > > > > suspect it is behaving differently in your environment. It's on my
> > list
> > > > to
> > > > > duplicate your build environment, including jenkins, but I haven't
> > done
> > > > it
> > > > > yet.
> > > >
> > > > It doesn't exist in WORKDIR
> > > > OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0
> > > > -name arm-nodistro-linux-gnueabi-libtool
> > > >
> > > > or sysroot
> > > >
> > > > OE qemuarm@ ~/oe/shr-core-branches/shr-core $ find
> > > > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > -name arm-nodistro-linux-gnueabi-libtool
> > > >
> > > > only libtool I have is:
> > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolize
> > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtool
> > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtool
> > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolize
> > > >
> > > > > > > + sed -i -e
> > > > > >
> > > >
> > s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > > > > doltlibtool
> > > >
> > > > I guess you should use ${TARGET_SYS}-libtool here.
> > > >
> > > > Because TARGET_VENDOR != ${DISTRO}
> > > >
> > > > I'll change it in master-next and check it in my build, please test it
> > > > in your angstrom build as well and let me know.
> > > >
> > > > > --Tim
> > > > >
> > > > >
> > > > > On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <martin.jansa@gmail.com
> > >
> > > > wrote:
> > > > >
> > > > > > On Tue, Feb 25, 2014 at 09:39:57PM -0800, Tim Orling wrote:
> > > > > > > From: Tim Orling <TicoTimo@gmail.com>
> > > > > > >
> > > > > > > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > > > > > > ---
> > > > > > > .../vlc/files/0001-enable-subdir-objects.patch | 13
> > > > +++++++++++++
> > > > > > > .../files/0002-glibc-does-not-provide-strlcpy.patch | 17
> > > > > > +++++++++++++++++
> > > > > > > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10
> > > > +++++++---
> > > > > > > meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19
> > > > > > -------------------
> > > > > > > meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17
> > > > > > +++++++++++++++++
> > > > > > > 5 files changed, 54 insertions(+), 22 deletions(-)
> > > > > > > create mode 100644
> > > > > >
> > > >
> > meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > > > create mode 100644
> > > > > >
> > > >
> > meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > > > delete mode 100644 meta-multimedia/recipes-multimedia/vlc/
> > > > vlc_1.1.11.bb
> > > > > > > create mode 100644 meta-multimedia/recipes-multimedia/vlc/
> > > > vlc_2.1.2.bb
> > > > > >
> > > > > > Hi,
> > > > > >
> > > > > > it fails to build in world verification:
> > > > > >
> > > > > > | make[1]: Entering directory
> > > > > >
> > > > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > > > > | Making all in compat
> > > > > > | make[2]: Entering directory
> > > > > >
> > > > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > > | make all-am
> > > > > > | make[3]: Entering directory
> > > > > >
> > > > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > > > > -mthumb-interwork
> > > > > >
> > > > > >
> > > >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
> > -O2
> > > > > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> > -Wsign-compare
> > > > > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > > > > -Wmissing-prototypes -Wvolatile-register-var
> > > > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o dummy.lo
> > dummy.c
> > > > > > | ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm
> > > > > > -mthumb-interwork
> > > > > >
> > > > > >
> > > >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > > > -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
> > -O2
> > > > > > -pipe -g -feliminate-unused-debug-types -Wall -Wextra
> > -Wsign-compare
> > > > > > -Wundef -Wpointer-arith -Wbad-function-cast -Wwrite-strings
> > > > > > -Wmissing-prototypes -Wvolatile-register-var
> > > > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > > > -ffast-math -funroll-loops -fomit-frame-pointer -c -o strlcpy.lo
> > > > > > strlcpy.c
> > > > > > | ../doltlibtool --tag=CC --mode=link arm-oe-linux-gnueabi-gcc
> > > > > > -march=armv5te -marm -mthumb-interwork
> > > > > >
> > > > > >
> > > >
> > --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
> > > > > > -std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall
> > -Wextra
> > > > > > -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast
> > > > > > -Wwrite-strings -Wmissing-prototypes -Wvolatile-register-var
> > > > > > -Werror-implicit-function-declaration -pipe -fvisibility=hidden
> > > > > > -ffast-math -funroll-loops -fomit-frame-pointer -no-undefined
> > -static
> > > > > > -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la-rpath
> > > > > > /usr/lib/vlc dummy.lo strlcpy.lo
> > > > > > | ../doltlibtool: line 18: exec:
> > arm-nodistro-linux-gnueabi-libtool:
> > > > not
> > > > > > found
> > > > > > | make[3]: *** [libcompat.la] Error 127
> > > > > > | make[3]: Leaving directory
> > > > > >
> > > > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > > | make[2]: *** [all] Error 2
> > > > > > | make[2]: Leaving directory
> > > > > >
> > > > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2/compat'
> > > > > > | make[1]: *** [all-recursive] Error 1
> > > > > > | make[1]: Leaving directory
> > > > > >
> > > > > >
> > > >
> > `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/vlc-2.1.2'
> > > > > > | make: *** [all] Error 2
> > > > > > | ERROR: oe_runmake failed
> > > > > > | WARNING: exit code 1 from a shell command.
> > > > > > | ERROR: Function failed: do_compile (log file is located at
> > > > > >
> > > > > >
> > > >
> > /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/vlc/2.1.2-r0/temp/log.do_compile.6302)
> > > > > > NOTE: recipe vlc-2.1.2-r0: task do_compile: Failed
> > > > > >
> > > > > > Can you please check? I'll send updated bitbake world status later
> > > > today
> > > > > > or tomorrow (with full log)
> > > > > > http://www.openembedded.org/wiki/Bitbake_World_Status
> > > > > >
> > > > > > >
> > > > > > > diff --git
> > > > > >
> > > >
> > a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > >
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > > > new file mode 100644
> > > > > > > index 0000000..9f0e708
> > > > > > > --- /dev/null
> > > > > > > +++
> > > > > >
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> > > > > > > @@ -0,0 +1,13 @@
> > > > > > > +Index: vlc-2.1.2/configure.ac
> > > > > > >
> > +===================================================================
> > > > > > > +--- vlc-2.1.2.orig/configure.ac
> > > > > > > ++++ vlc-2.1.2/configure.ac
> > > > > > > +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> > > > > > > + AC_CANONICAL_HOST
> > > > > > > + AC_PRESERVE_HELP_ORDER
> > > > > > > +
> > > > > > > +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> > > > > > > ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> > > > > > > + AC_CONFIG_HEADERS([config.h])
> > > > > > > +
> > > > > > > + # Disable with "./configure --disable-silent-rules" or "make
> > V=1"
> > > > > > > diff --git
> > > > > >
> > > >
> > a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > >
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > > > new file mode 100644
> > > > > > > index 0000000..6d2a46f
> > > > > > > --- /dev/null
> > > > > > > +++
> > > > > >
> > > >
> > b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> > > > > > > @@ -0,0 +1,17 @@
> > > > > > > +Index: vlc-2.1.2/src/input/subtitles.c
> > > > > > >
> > +===================================================================
> > > > > > > +--- vlc-2.1.2.orig/src/input/subtitles.c
> > > > > > > ++++ vlc-2.1.2/src/input/subtitles.c
> > > > > > > +@@ -44,6 +44,12 @@
> > > > > > > + #include "input_internal.h"
> > > > > > > +
> > > > > > > + /**
> > > > > > > ++ * Drepper's alternative
> > > > > > > ++ *
> > > > > >
> > > >
> > http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> > > > > > > ++ */
> > > > > > > ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) =
> > > > '\0'
> > > > > > > ++
> > > > > > > ++/**
> > > > > > > + * We are not going to autodetect more subtitle files than
> > this.
> > > > > > > + */
> > > > > > > + #define MAX_SUBTITLE_FILES 128
> > > > > > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > > index 6400719..976c3bf 100644
> > > > > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> > > > > > > @@ -5,13 +5,13 @@ SECTION = "multimedia"
> > > > > > >
> > > > > > > DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad
> > > > virtual/libsdl
> > > > > > qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
> > > > fluidsynth
> > > > > > alsa-lib"
> > > > > > >
> > > > > > > -SRC_URI = "
> > > > > >
> > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> > > > > > > +SRC_URI = "
> > > > > >
> > http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
> > > > > > >
> > > > > > > inherit autotools gettext
> > > > > > >
> > > > > > > ARM_INSTRUCTION_SET = "arm"
> > > > > > >
> > > > > > > -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> > > > > > > +DEPENDS += "libdvdcss libdvdread lua-native lua"
> > > > > > >
> > > > > > > LEAD_SONAME = "libvlc.so.5"
> > > > > > >
> > > > > > > @@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
> > > > > > >
> > > > > > > FILES_libvlc = "${libdir}/lib*.so.*"
> > > > > > >
> > > > > > > +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> > > > > > > +
> > > > > > > FILES_${PN} += "${bindir}/vlc \
> > > > > > > ${datadir}/applications \
> > > > > > > ${datadir}/vlc/ \
> > > > > > > @@ -71,6 +73,7 @@ PACKAGECONFIG[id3tag] =
> > > > > > "--enable-id3tag,--disable-id3tag,libid3tag"
> > > > > > > PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> > > > > > > PACKAGECONFIG[mpeg2dec] =
> > > > > > "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
> > > > > > > PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> > > > > > > +PACKAGECONFIG[live555] =
> > > > "--enable-live555,--disable-live555,live555"
> > > > > > >
> > > > > > > do_configure() {
> > > > > > > cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> > > > > > > @@ -81,6 +84,7 @@ do_configure() {
> > > > > > > cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ ||
> > true
> > > > > > > oe_runconf
> > > > > > > rm config.log
> > > > > > > - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > > > > + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> > > > > > > sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\
> > > > > > -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> > > > > > > + sed -i -e
> > > > > >
> > > >
> > s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
> > > > > > doltlibtool
> > > > > > > }
> > > > > > > diff --git
> > > >
> > a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > > > > vlc_1.1.11.bb
> > > > > > > deleted file mode 100644
> > > > > > > index 368db59..0000000
> > > > > > > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
> > > > > > > +++ /dev/null
> > > > > > > @@ -1,19 +0,0 @@
> > > > > > > -# This recipe packages vlc as a library as well, so qt4
> > dependencies
> > > > > > > -# can be avoided when only the library is installed.
> > > > > > > -
> > > > > > > -LIC_FILES_CHKSUM =
> > > > "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
> > > > > > > -
> > > > > > > -require vlc.inc
> > > > > > > -
> > > > > > > -SRC_URI +=
> > > > > >
> > > >
> > "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
> > > > > > > -SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
> > > > > > > -SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
> > > > > > > -
> > > > > > > -PR = "r4"
> > > > > > > -
> > > > > > > -# work around build failure
> > > > > > > -EXTRA_OECONF += " --enable-libxml2=no"
> > > > > > > -
> > > > > > > -SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
> > > > > > > -SRC_URI[sha256sum] =
> > > > > > "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
> > > > > > > -
> > > > > > > diff --git
> > > >
> > a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
> > > > > > vlc_2.1.2.bb
> > > > > > > new file mode 100644
> > > > > > > index 0000000..a33f93f
> > > > > > > --- /dev/null
> > > > > > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> > > > > > > @@ -0,0 +1,17 @@
> > > > > > > +# This recipe packages vlc as a library as well, so qt4
> > dependencies
> > > > > > > +# can be avoided when only the library is installed.
> > > > > > > +
> > > > > > > +LIC_FILES_CHKSUM =
> > > > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > > > > > +
> > > > > > > +require vlc.inc
> > > > > > > +
> > > > > > > +# work around build failure
> > > > > > > +EXTRA_OECONF += " --enable-libxml2=no"
> > > > > > > +
> > > > > > > +SRC_URI += "file://0001-enable-subdir-objects.patch \
> > > > > > > + file://0002-glibc-does-not-provide-strlcpy.patch \
> > > > > > > +"
> > > > > > > +
> > > > > > > +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> > > > > > > +SRC_URI[sha256sum] =
> > > > > > "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> > > > > > > +
> > > > > > > --
> > > > > > > 1.8.3.2
> > > > > > >
> > > > > > > _______________________________________________
> > > > > > > Openembedded-devel mailing list
> > > > > > > Openembedded-devel@lists.openembedded.org
> > > > > > >
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > > > > >
> > > > > > --
> > > > > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > > > > >
> > > > > > _______________________________________________
> > > > > > 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
> > > >
> > > > --
> > > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > > >
> > > > --
> > > > _______________________________________________
> > > > 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
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> > --
> > _______________________________________________
> > 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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-03-15 14:50 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-26 5:39 [meta-multimedia][PATCH v2 0/3] update vlc to 2.1.2 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 1/3] libdvdcss: update to 1.2.13 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 2/3] live555: update to 2013.04.30 Tim Orling
2014-02-26 5:39 ` [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2 Tim Orling
2014-02-26 12:48 ` Walter Goossens
2014-02-27 17:18 ` Timothy Orling
2014-02-27 19:28 ` Walter Goossens
2014-03-05 17:56 ` Martin Jansa
2014-03-09 4:54 ` Tim Orling
2014-03-11 15:26 ` Martin Jansa
2014-03-12 15:13 ` Tim Orling
2014-03-12 21:12 ` Martin Jansa
2014-03-12 22:32 ` Tim Orling
2014-03-15 14:51 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.