update vlc to 2.1.2
v2 cover update vlc to 2.1.2
From: Tim Orling <[email protected]>
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.bbSignature · 1 line
1.8.3.2
PATCH v2 1/3 libdvdcss: update to 1.2.13
From: Tim Orling <[email protected]>
---
.../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%)meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb renamed from meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.10.bb +2 -3
@@ -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"
Signature · 1 line
1.8.3.2
PATCH v2 2/3 live555: update to 2013.04.30
In reply to Tim OrlingFrom: Tim Orling <[email protected]>
--- 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
meta-oe/recipes-multimedia/live555/live555_20110314.bb deleted +0 -10
@@ -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" - -
meta-oe/recipes-multimedia/live555/live555_20130430.bb new file +7 -0
@@ -0,0 +1,7 @@ +require live555.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" + +SRC_URI[md5sum] = "95533d91bd196e42fd748076dc244b09" +SRC_URI[sha256sum] = "e549af608c9961d85cb647bc3b99804fec0fbaf5338c1b72d057558ae5cd2aea" +
Signature · 1 line
1.8.3.2
PATCH v2 3/3 vlc: update to 2.1.2
In reply to Tim OrlingFrom: Tim Orling <[email protected]>
--- .../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
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13 -0
@@ -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"
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +17 -0
@@ -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
meta-multimedia/recipes-multimedia/vlc/vlc.inc +7 -3
@@ -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 }
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0 -19
@@ -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" -
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +17 -0
@@ -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" +
Signature · 1 line
1.8.3.2
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
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
Quoted 151 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../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.bbmeta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13
-0@@ -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"meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +17
-0@@ -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 128meta-multimedia/recipes-multimedia/vlc/vlc.inc +7
-3@@ -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 }meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-19@@ -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" -meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +17
-0@@ -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" +
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
Quoted 15 lines · Walter Goossens
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 anx86_64machine 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.
Quoted 151 lines
Walter
Quoted 148 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>---
.../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.patchcreate mode 100644meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchdelete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbmeta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13
-0@@ -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"meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +17
-0@@ -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 128meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -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"
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1-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"meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1-DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1" +DEPENDS += "libdvdcss libdvdread lua-native lua"
LEAD_SONAME= "libvlc.so.5"meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
FILES_libvlc= "${libdir}/lib*.so.*"meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-0+FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a" +FILES_${PN} += "${bindir}/vlc \ ${datadir}/applications \ ${datadir}/vlc/ \meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -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/meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-1@@ -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 }meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-19@@ -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" -meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +14
-0@@ -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 \ +" +
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 17
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +3
-0+SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426" +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4" +_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--Tim
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
Quoted 17 lines · Timothy Orling
Quoted 15 lines · Walter Goossens
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 anx86_64machine 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.
Quoted 3 lines
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
Quoted 164 lines
Quoted 150 lines
Walter
Quoted 147 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>---
.../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.patchcreate mode 100644meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchdelete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbmeta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13
-0@@ -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"meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +17
-0@@ -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 128meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -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"
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1-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"meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1-DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1" +DEPENDS += "libdvdcss libdvdread lua-native lua"
LEAD_SONAME= "libvlc.so.5"meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -36,6 +36,8 @@ FILES_libvlc-dbg = "\
FILES_libvlc= "${libdir}/lib*.so.*"meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-0+FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a" +FILES_${PN} += "${bindir}/vlc \ ${datadir}/applications \ ${datadir}/vlc/ \meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -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/meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-1@@ -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 }meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-19@@ -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" -meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +13
-0@@ -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 \ +"Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 17
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +4
-0+ +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426" +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4" +_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--Tim
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
In reply to Tim OrlingQuoted 14 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../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.lostrlcpy.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
Quoted 144 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13
-0@@ -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"meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +17
-0@@ -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 128meta-multimedia/recipes-multimedia/vlc/vlc.inc +7
-3@@ -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 }meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-19@@ -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" -meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +17
-0@@ -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" +Signature · 6 lines
1.8.3.2 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
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
Quoted 270 lines · Martin Jansa
Quoted 6 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++ .../files/0002-glibc-does-not-provide-strlcpy.patch | 17+++++++++++++++++
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++--- meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19-------------------
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17+++++++++++++++++
Quoted 2 lines
5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 1 line
create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 2 lines
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.bbHi,
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
(quoted diff) +0
-8-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
(quoted diff) +0
-8-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(quoted diff) +0
-8-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/vlcdummy.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: taskdo_compile: FailedCan you please check? I'll send updated bitbake world status later today or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_StatusQuoted 2 lines
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchb/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 4 lines
new file mode 100644
index 0000000..9f0e708
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 14 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13
-0@@ -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"Quoted 1 line
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchb/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 4 lines
new file mode 100644
index 0000000..6d2a46f
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchmeta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch line 10
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +10
-0@@ -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
Review
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +7
-0++ */ ++#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(quoted diff) +0
-0b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 6
Quoted 6 lines
index 6400719..976c3bf 100644
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -5,13 +5,13 @@ SECTION = "multimedia" DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdlqt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-1-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] =
Quoted 20 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-1inherit 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"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 74
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] ="--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 88
Quoted 12 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-1PACKAGECONFIG[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
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 89
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+ sed -i -es:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
Review
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0}(quoted diff) +0
-0vlc_1.1.11.bb
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 8
Quoted 13 lines
deleted file mode 100644
index 368db59..0000000meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-8@@ -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"
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-10-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"Review
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1-(quoted diff) +0
-0vlc_2.1.2.bb
Quoted 11 lines
new file mode 100644
index 0000000..a33f93fmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +6
-0@@ -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.incmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 16
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +10
-0+ +# 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"Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-1+ --1.8.3.2
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
Quoted 7 lines · Tim Orling
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
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
+ 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.
Quoted 280 lines
--Tim
Quoted 270 lines · Martin Jansa
Quoted 6 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++ .../files/0002-glibc-does-not-provide-strlcpy.patch | 17+++++++++++++++++
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 +++++++--- meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19-------------------
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17+++++++++++++++++
Quoted 2 lines
5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 1 line
create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 2 lines
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.bbHi,
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
(quoted diff) +0
-8-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
(quoted diff) +0
-8-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(quoted diff) +0
-8-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/vlcdummy.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: taskdo_compile: FailedCan you please check? I'll send updated bitbake world status later today or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_StatusQuoted 2 lines
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchb/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 4 lines
new file mode 100644
index 0000000..9f0e708
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 14 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +13
-0@@ -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"Quoted 1 line
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchb/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 4 lines
new file mode 100644
index 0000000..6d2a46f
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchmeta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch line 10
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +10
-0@@ -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
Review
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +7
-0++ */ ++#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(quoted diff) +0
-0b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 6
Quoted 6 lines
index 6400719..976c3bf 100644
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -5,13 +5,13 @@ SECTION = "multimedia" DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdlqt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-1-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] =
Quoted 20 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-1inherit 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"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 74
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] ="--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 88
Quoted 12 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-1PACKAGECONFIG[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
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 89
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+ sed -i -es:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
Review
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0}(quoted diff) +0
-0vlc_1.1.11.bb
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 8
Quoted 13 lines
deleted file mode 100644
index 368db59..0000000meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-8@@ -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"
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-10-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"Review
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1-(quoted diff) +0
-0vlc_2.1.2.bb
Quoted 11 lines
new file mode 100644
index 0000000..a33f93fmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +6
-0@@ -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.incmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 16
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +10
-0+ +# 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"Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-1+ --1.8.3.2
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develSignature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
Confirmed. That's what I "meant" to do in the first place.
I'll submit an updated patch within the next day or so.
Quoted 374 lines · Martin Jansa
Quoted 3 lines · Tim Orling
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
Quoted 1 line
the doltlibtool script, which was the reason for the sed fix in vlc.inc.
I
Quoted 1 line
suspect it is behaving differently in your environment. It's on my list
to
Quoted 1 line
duplicate your build environment, including jenkins, but I haven't done
it
Quoted 1 line
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-libtoolor 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-libtoolonly 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/libtoolizeQuoted 2 lines
Quoted 2 lines
Quoted 1 line
+ sed -i -e
s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 1 line
Quoted 1 line
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.
Quoted 4 lines
--Tim
On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <[email protected]>
Quoted 7 lines · wrote:
Quoted 7 lines · Tim Orling
Quoted 5 lines
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../vlc/files/0001-enable-subdir-objects.patch | 13+++++++++++++
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
.../files/0002-glibc-does-not-provide-strlcpy.patch | 17+++++++++++++++++
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10+++++++---
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19-------------------
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17+++++++++++++++++
Quoted 2 lines
5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 2 lines
Quoted 2 lines
Quoted 1 line
create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 1 line
Quoted 1 line
Quoted 1 line
delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 8 lines
Quoted 8 lines
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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 4 lines
Quoted 4 lines
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
Quoted 10 lines
Quoted 10 lines
(quoted diff) +0
-6-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
Quoted 11 lines
Quoted 11 lines
(quoted diff) +0
-6-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
Quoted 8 lines
Quoted 8 lines
(quoted diff) +0
-6-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/vlcdummy.lo strlcpy.lo
| ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool:not
Quoted 5 lines
Quoted 5 lines
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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 6 lines
Quoted 6 lines
| 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)Quoted 3 lines
Quoted 3 lines
NOTE: recipe vlc-2.1.2-r0: task
do_compile: FailedCan you please check? I'll send updated bitbake world status later
today
Quoted 6 lines
Quoted 6 lines
or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_StatusQuoted 2 lines
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..9f0e708
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +7
-0@@ -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_ORDERQuoted 8 lines
Quoted 8 lines
Quoted 7 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +6
-0+ +-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.patchQuoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..6d2a46f
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +3
-0@@ -0,0 +1,17 @@ +Index: vlc-2.1.2/src/input/subtitles.c +=================================================================== +--- vlc-2.1.2.orig/src/input/subtitles.cQuoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
Quoted 7 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +7
-0++++ 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
Quoted 2 lines
Quoted 2 lines
Review line 12
Quoted 2 lines
(quoted diff) +2
-0++ */ ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) ='\0'
Quoted 7 lines
Quoted 7 lines
Review
Quoted 6 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +5
-0++ ++/** + * We are not going to autodetect more subtitle files than this. + */ + #define MAX_SUBTITLE_FILES 128(quoted diff) +0
-0b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
Quoted 6 lines
Quoted 6 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 6
Quoted 6 lines
index 6400719..976c3bf 100644
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -5,13 +5,13 @@ SECTION = "multimedia" DEPENDS = "libfribidi libtool libgcrypt gst-plugins-badvirtual/libsdl
Quoted 1 line
Quoted 1 line
qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
fluidsynth
Quoted 27 lines
Quoted 27 lines
alsa-lib"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-1-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] =
Quoted 20 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-1inherit 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"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 74
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] ="--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] ="--enable-live555,--disable-live555,live555"
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 88
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1do_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
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 89
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+ sed -i -es:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 3 lines
Quoted 3 lines
doltlibtool
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0}diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 10 lines
Quoted 10 lines
vlc_1.1.11.bb
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 4
Quoted 9 lines
deleted file mode 100644
index 368db59..0000000meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-4@@ -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"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-4- -require vlc.inc - -SRC_URI +="file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-10-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"Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1-diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 10 lines
Quoted 10 lines
vlc_2.1.2.bb
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 4
Quoted 9 lines
new file mode 100644
index 0000000..a33f93fmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +4
-0@@ -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"
Quoted 31 lines
Quoted 22 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 12 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +12
-0+ +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"Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-1+ --1.8.3.2
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 9 lines
--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
Quoted 3 lines · Tim Orling
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
Quoted 381 lines · Martin Jansa
Quoted 375 lines · Tim Orling
Quoted 3 lines
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
Quoted 1 line
the doltlibtool script, which was the reason for the sed fix in vlc.inc.
I
Quoted 1 line
suspect it is behaving differently in your environment. It's on my list
to
Quoted 1 line
duplicate your build environment, including jenkins, but I haven't done
it
Quoted 1 line
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-libtoolor 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-libtoolonly 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/libtoolizeQuoted 2 lines
Quoted 2 lines
Quoted 1 line
+ sed -i -e
s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 1 line
Quoted 1 line
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.
Quoted 4 lines
--Tim
On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <[email protected]>
Quoted 7 lines · wrote:
Quoted 7 lines · Tim Orling
Quoted 5 lines
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../vlc/files/0001-enable-subdir-objects.patch | 13+++++++++++++
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
.../files/0002-glibc-does-not-provide-strlcpy.patch | 17+++++++++++++++++
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10+++++++---
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19-------------------
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17+++++++++++++++++
Quoted 2 lines
5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 2 lines
Quoted 2 lines
Quoted 1 line
create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 1 line
Quoted 1 line
Quoted 1 line
delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 8 lines
Quoted 8 lines
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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 4 lines
Quoted 4 lines
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
Quoted 10 lines
Quoted 10 lines
(quoted diff) +0
-6-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
Quoted 11 lines
Quoted 11 lines
(quoted diff) +0
-6-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
Quoted 8 lines
Quoted 8 lines
(quoted diff) +0
-6-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/vlcdummy.lo strlcpy.lo
| ../doltlibtool: line 18: exec: arm-nodistro-linux-gnueabi-libtool:not
Quoted 5 lines
Quoted 5 lines
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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 6 lines
Quoted 6 lines
| 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)Quoted 3 lines
Quoted 3 lines
NOTE: recipe vlc-2.1.2-r0: task
do_compile: FailedCan you please check? I'll send updated bitbake world status later
today
Quoted 6 lines
Quoted 6 lines
or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_StatusQuoted 2 lines
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..9f0e708
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +7
-0@@ -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_ORDERQuoted 8 lines
Quoted 8 lines
Quoted 7 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +6
-0+ +-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.patchQuoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..6d2a46f
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +3
-0@@ -0,0 +1,17 @@ +Index: vlc-2.1.2/src/input/subtitles.c +=================================================================== +--- vlc-2.1.2.orig/src/input/subtitles.cQuoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
Quoted 7 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +7
-0++++ 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
Quoted 2 lines
Quoted 2 lines
Review line 12
Quoted 2 lines
(quoted diff) +2
-0++ */ ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) ='\0'
Quoted 7 lines
Quoted 7 lines
Review
Quoted 6 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +5
-0++ ++/** + * We are not going to autodetect more subtitle files than this. + */ + #define MAX_SUBTITLE_FILES 128(quoted diff) +0
-0b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
Quoted 6 lines
Quoted 6 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 6
Quoted 6 lines
index 6400719..976c3bf 100644
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -5,13 +5,13 @@ SECTION = "multimedia" DEPENDS = "libfribidi libtool libgcrypt gst-plugins-badvirtual/libsdl
Quoted 1 line
Quoted 1 line
qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
fluidsynth
Quoted 27 lines
Quoted 27 lines
alsa-lib"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-1-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] =
Quoted 20 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-1inherit 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"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 74
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] ="--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] ="--enable-live555,--disable-live555,live555"
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 88
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1do_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
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 89
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+ sed -i -es:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 3 lines
Quoted 3 lines
doltlibtool
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0}diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 10 lines
Quoted 10 lines
vlc_1.1.11.bb
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 4
Quoted 9 lines
deleted file mode 100644
index 368db59..0000000meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-4@@ -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"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-4- -require vlc.inc - -SRC_URI +="file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-10-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"Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1-diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 10 lines
Quoted 10 lines
vlc_2.1.2.bb
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 4
Quoted 9 lines
new file mode 100644
index 0000000..a33f93fmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +4
-0@@ -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"
Quoted 31 lines
Quoted 22 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 12 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +12
-0+ +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"Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-1+ --1.8.3.2
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 9 lines
--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develSignature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
I made the mistake of doing FILES_libvlc-staticdev when I should have used FILES_${PN}-staticdev. I will fix in the patch.
Quoted 468 lines · Martin Jansa
Quoted 3 lines · Tim Orling
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_SKIPto hide QA message.Thanks
Quoted 6 lines
Quoted 3 lines · On Tue, Mar 11, 2014 at 8:26 AM, Martin Jansa <[email protected] wrote:
Quoted 2 lines · Tim Orling
Can you check the build directory to see if arm-nodistro-linux-gnueabi-libtool was created? I'm building in
angstrom,
Quoted 1 line
Quoted 1 line
Quoted 1 line
so I see arm-angstrom-linux-gnueabi-libtool... This was not being
found
Quoted 2 lines
Quoted 2 lines
by
Quoted 1 line
the doltlibtool script, which was the reason for the sed fix in
vlc.inc.
Quoted 2 lines
Quoted 2 lines
I
Quoted 1 line
suspect it is behaving differently in your environment. It's on my
list
Quoted 2 lines
Quoted 2 lines
to
Quoted 1 line
duplicate your build environment, including jenkins, but I haven't
done
Quoted 7 lines
Quoted 7 lines
it
Quoted 1 line
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-r0Quoted 11 lines
Quoted 11 lines
-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-libtoolonly libtool I have is:
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolizeQuoted 2 lines
Quoted 2 lines
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtoolQuoted 2 lines
Quoted 2 lines
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtoolQuoted 2 lines
Quoted 2 lines
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolizeQuoted 4 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
+ sed -i -e
s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 27 lines
Quoted 27 lines
Quoted 1 line
Quoted 1 line
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.
Quoted 4 lines
--Tim
On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <[email protected]
Quoted 7 lines · wrote:
Quoted 7 lines · Tim Orling
Quoted 5 lines
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../vlc/files/0001-enable-subdir-objects.patch | 13+++++++++++++
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
.../files/0002-glibc-does-not-provide-strlcpy.patch | 17+++++++++++++++++
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10+++++++---
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19-------------------
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17+++++++++++++++++
Quoted 2 lines
5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 5 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 1 line
Quoted 1 line
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
-O2
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-pipe -g -feliminate-unused-debug-types -Wall -Wextra
-Wsign-compare
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
(quoted diff) +0
-4-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.cQuoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
-O2
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-pipe -g -feliminate-unused-debug-types -Wall -Wextra
-Wsign-compare
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
(quoted diff) +0
-4-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
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall
-Wextra
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
(quoted diff) +0
-4-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
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la-rpath
/usr/lib/vlcdummy.lo strlcpy.lo
| ../doltlibtool: line 18: exec:arm-nodistro-linux-gnueabi-libtool:
Quoted 7 lines
Quoted 7 lines
not
Quoted 5 lines
Quoted 5 lines
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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
| 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)Quoted 11 lines
Quoted 11 lines
Quoted 3 lines
Quoted 3 lines
NOTE: recipe vlc-2.1.2-r0: task
do_compile: FailedCan you please check? I'll send updated bitbake world status later
today
Quoted 6 lines
Quoted 6 lines
or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_StatusQuoted 2 lines
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 2 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..9f0e708
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch line 1
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +1
-0@@ -0,0 +1,13 @@ +Index: vlc-2.1.2/configure.ac+===================================================================
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch new file +11
-0+--- 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 "makeV=1"
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 2 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..6d2a46f
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch line 1
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +1
-0@@ -0,0 +1,17 @@ +Index: vlc-2.1.2/src/input/subtitles.c+===================================================================
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +8
-0+--- 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
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
Review line 11
Quoted 2 lines
(quoted diff) +2
-0++ */ ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) ='\0'
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +3
-0++ ++/** + * We are not going to autodetect more subtitle files thanthis.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Review
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch new file +2
-0+ */ + #define MAX_SUBTITLE_FILES 128(quoted diff) +0
-0b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
Quoted 5 lines
index 6400719..976c3bf 100644
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -5,13 +5,13 @@ SECTION = "multimedia"Quoted 8 lines
Quoted 8 lines
Quoted 1 line
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 6
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0DEPENDS = "libfribidi libtool libgcrypt gst-plugins-badvirtual/libsdl
Quoted 1 line
Quoted 1 line
qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
fluidsynth
Quoted 4 lines
Quoted 4 lines
alsa-lib"
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-1-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] =
Quoted 20 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-1inherit 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"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 74
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] ="--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 76
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] ="--enable-live555,--disable-live555,live555"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 84
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0do_configure() { cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/@@ -81,6 +84,7 @@ do_configure() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ ||true
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() {
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1oe_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
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+ sed -i -es:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
doltlibtool
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0}diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
vlc_1.1.11.bb
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 1
Quoted 6 lines
deleted file mode 100644
index 368db59..0000000meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1@@ -1,19 +0,0 @@ -# This recipe packages vlc as a library as well, so qt4dependencies
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-3-# can be avoided when only the library is installed. - -LIC_FILES_CHKSUM ="file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-4- -require vlc.inc - -SRC_URI +="file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-10-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"Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1-diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
vlc_2.1.2.bb
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 1
Quoted 6 lines
new file mode 100644
index 0000000..a33f93fmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-0@@ -0,0 +1,17 @@ +# This recipe packages vlc as a library as well, so qt4dependencies
Quoted 17 lines
Quoted 17 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +3
-0+# can be avoided when only the library is installed. + +LIC_FILES_CHKSUM ="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
Quoted 13 lines
Quoted 13 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 12 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +12
-0+ +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"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-1+ --1.8.3.2
_______________________________________________
Openembedded-devel mailing list
[email protected]http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 26 lines
Quoted 16 lines
Quoted 10 lines
Quoted 10 lines
--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 10 lines
--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-multimedia][PATCH v2 3/3] vlc: update to 2.1.2
Quoted 2 lines · Tim Orling
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
Quoted 475 lines · Martin Jansa
Quoted 469 lines · Tim Orling
Quoted 3 lines
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_SKIPto hide QA message.Thanks
Quoted 6 lines
Quoted 3 lines · On Tue, Mar 11, 2014 at 8:26 AM, Martin Jansa <[email protected] wrote:
Quoted 2 lines · Tim Orling
Can you check the build directory to see if arm-nodistro-linux-gnueabi-libtool was created? I'm building in
angstrom,
Quoted 1 line
Quoted 1 line
Quoted 1 line
so I see arm-angstrom-linux-gnueabi-libtool... This was not being
found
Quoted 2 lines
Quoted 2 lines
by
Quoted 1 line
the doltlibtool script, which was the reason for the sed fix in
vlc.inc.
Quoted 2 lines
Quoted 2 lines
I
Quoted 1 line
suspect it is behaving differently in your environment. It's on my
list
Quoted 2 lines
Quoted 2 lines
to
Quoted 1 line
duplicate your build environment, including jenkins, but I haven't
done
Quoted 7 lines
Quoted 7 lines
it
Quoted 1 line
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-r0Quoted 11 lines
Quoted 11 lines
-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-libtoolonly libtool I have is:
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/libtoolizeQuoted 2 lines
Quoted 2 lines
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/bin/crossscripts/arm-oe-linux-gnueabi-libtoolQuoted 2 lines
Quoted 2 lines
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtoolQuoted 2 lines
Quoted 2 lines
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/libtoolizeQuoted 4 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
+ sed -i -e
s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 27 lines
Quoted 27 lines
Quoted 1 line
Quoted 1 line
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.
Quoted 4 lines
--Tim
On Wed, Mar 5, 2014 at 9:56 AM, Martin Jansa <[email protected]
Quoted 7 lines · wrote:
Quoted 7 lines · Tim Orling
Quoted 5 lines
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- .../vlc/files/0001-enable-subdir-objects.patch | 13+++++++++++++
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
.../files/0002-glibc-does-not-provide-strlcpy.patch | 17+++++++++++++++++
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10+++++++---
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 19-------------------
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 17+++++++++++++++++
Quoted 2 lines
5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
create mode 100644
meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 5 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
Quoted 1 line
Quoted 1 line
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
-O2
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-pipe -g -feliminate-unused-debug-types -Wall -Wextra
-Wsign-compare
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
(quoted diff) +0
-4-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.cQuoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| ../doltcompile arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork
--sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../include -I../include
-O2
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-pipe -g -feliminate-unused-debug-types -Wall -Wextra
-Wsign-compare
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
(quoted diff) +0
-4-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
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
-std=gnu99 -O2 -pipe -g -feliminate-unused-debug-types -Wall
-Wextra
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
(quoted diff) +0
-4-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
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o libcompat.la-rpath
/usr/lib/vlcdummy.lo strlcpy.lo
| ../doltlibtool: line 18: exec:arm-nodistro-linux-gnueabi-libtool:
Quoted 7 lines
Quoted 7 lines
not
Quoted 5 lines
Quoted 5 lines
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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
| 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'
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
| 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)Quoted 11 lines
Quoted 11 lines
Quoted 3 lines
Quoted 3 lines
NOTE: recipe vlc-2.1.2-r0: task
do_compile: FailedCan you please check? I'll send updated bitbake world status later
today
Quoted 6 lines
Quoted 6 lines
or tomorrow (with full log)
http://www.openembedded.org/wiki/Bitbake_World_StatusQuoted 2 lines
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 2 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..9f0e708
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patchQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review line 1
Quoted 3 lines
(quoted diff) +1
-0@@ -0,0 +1,13 @@ +Index: vlc-2.1.2/configure.ac+===================================================================
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Review line 12
Quoted 11 lines
(quoted diff) +11
-0+--- 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 "makeV=1"
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
diff --git
a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 2 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
new file mode 100644
index 0000000..6d2a46f
---/dev/null
+++
b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patchQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review line 1
Quoted 3 lines
(quoted diff) +1
-0@@ -0,0 +1,17 @@ +Index: vlc-2.1.2/src/input/subtitles.c+===================================================================
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
Review line 9
Quoted 8 lines
(quoted diff) +8
-0+--- 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
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
Review line 11
Quoted 2 lines
(quoted diff) +2
-0++ */ ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) ='\0'
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
(quoted diff) +3
-0++ ++/** + * We are not going to autodetect more subtitle files thanthis.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ */ + #define MAX_SUBTITLE_FILES 128(quoted diff) +0
-0b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
Quoted 5 lines
index 6400719..976c3bf 100644
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0@@ -5,13 +5,13 @@ SECTION = "multimedia"Quoted 8 lines
Quoted 8 lines
Quoted 1 line
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 6
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0DEPENDS = "libfribidi libtool libgcrypt gst-plugins-badvirtual/libsdl
Quoted 1 line
Quoted 1 line
qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm
fluidsynth
Quoted 4 lines
Quoted 4 lines
alsa-lib"
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-1-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc SECTION = "multimedia" · line 7
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] =
Quoted 20 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-1inherit 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"
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 74
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] ="--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[id3tag] = · line 76
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] ="--enable-live555,--disable-live555,live555"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 84
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0do_configure() { cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/@@ -81,6 +84,7 @@ do_configure() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ ||true
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc do_configure() { · line 88
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-1oe_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
Quoted 1 line
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1
-0+ sed -i -es:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
doltlibtool
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0
-0}diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
vlc_1.1.11.bb
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 1
Quoted 6 lines
deleted file mode 100644
index 368db59..0000000meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1@@ -1,19 +0,0 @@ -# This recipe packages vlc as a library as well, so qt4dependencies
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 4
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-3-# can be avoided when only the library is installed. - -LIC_FILES_CHKSUM ="file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-4- -require vlc.inc - -SRC_URI +="file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb line 18
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-10-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"Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb deleted +0
-1-diff --git
a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bbb/meta-multimedia/recipes-multimedia/vlc/
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
vlc_2.1.2.bb
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 1
Quoted 6 lines
new file mode 100644
index 0000000..a33f93fmeta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-0@@ -0,0 +1,17 @@ +# This recipe packages vlc as a library as well, so qt4dependencies
Quoted 17 lines
Quoted 17 lines
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 4
Quoted 3 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +3
-0+# can be avoided when only the library is installed. + +LIC_FILES_CHKSUM ="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
Quoted 13 lines
Quoted 13 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 16
Quoted 12 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +12
-0+ +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"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +1
-1+ --1.8.3.2
_______________________________________________
Openembedded-devel mailing list
[email protected]http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 26 lines
Quoted 16 lines
Quoted 10 lines
Quoted 10 lines
--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 10 lines
--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develQuoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-develSignature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]