From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-multimedia][PATCH 3/3] vlc: update to 2.1.2
Date: Tue, 25 Feb 2014 18:19:54 +0100 [thread overview]
Message-ID: <20140225171954.GQ26981@jama> (raw)
In-Reply-To: <1393345975-20556-4-git-send-email-ticotimo@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 6272 bytes --]
On Tue, Feb 25, 2014 at 08:32:55AM -0800, Tim Orling wrote:
> From: Tim Orling <TicoTimo@gmail.com>
>
> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> ---
> .../vlc/files/0001-enable-subdir-objects.patch | 13 +++++++++++++
> .../files/0002-glibc-does-not-provide-strlcpy.patch | 17 +++++++++++++++++
> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 12 +++++++++---
> meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 19 +++++++++++++++++++
> 4 files changed, 58 insertions(+), 3 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
> create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> new file mode 100644
> index 0000000..9f0e708
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0001-enable-subdir-objects.patch
> @@ -0,0 +1,13 @@
> +Index: vlc-2.1.2/configure.ac
> +===================================================================
> +--- vlc-2.1.2.orig/configure.ac
> ++++ vlc-2.1.2/configure.ac
> +@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
> + AC_CANONICAL_HOST
> + AC_PRESERVE_HELP_ORDER
> +
> +-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
> ++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
> + AC_CONFIG_HEADERS([config.h])
> +
> + # Disable with "./configure --disable-silent-rules" or "make V=1"
> diff --git a/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> new file mode 100644
> index 0000000..6d2a46f
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/files/0002-glibc-does-not-provide-strlcpy.patch
> @@ -0,0 +1,17 @@
> +Index: vlc-2.1.2/src/input/subtitles.c
> +===================================================================
> +--- vlc-2.1.2.orig/src/input/subtitles.c
> ++++ vlc-2.1.2/src/input/subtitles.c
> +@@ -44,6 +44,12 @@
> + #include "input_internal.h"
> +
> + /**
> ++ * Drepper's alternative
> ++ * http://en.wikibooks.org/wiki/C_Programming/C_Reference/nonstandard/strlcpy
> ++ */
> ++#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0'
> ++
> ++/**
> + * We are not going to autodetect more subtitle files than this.
> + */
> + #define MAX_SUBTITLE_FILES 128
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index f3d8a03..6ff8c21 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -5,13 +5,13 @@ SECTION = "multimedia"
>
> DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
>
> -SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> +SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.xz"
>
> inherit autotools gettext
>
> ARM_INSTRUCTION_SET = "arm"
>
> -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> +DEPENDS += "libdvdcss libdvdread lua-native lua live555"
live555 is now in PACKAGECONFIG so you should drop it here.
>
> LEAD_SONAME = "libvlc.so.5"
>
> @@ -36,6 +36,9 @@ FILES_libvlc-dbg = "\
>
> FILES_libvlc = "${libdir}/lib*.so.*"
>
> +FILES_libvlc-staticdev = "${libdir}/vlc/plugins/*/*.a"
> +
> +
> FILES_${PN} += "${bindir}/vlc \
> ${datadir}/applications \
> ${datadir}/vlc/ \
> @@ -70,6 +73,8 @@ PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
> 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"
Please rebase before sending v2
http://git.openembedded.org/meta-openembedded/commit/?id=0a089a36ff22f8a8e425de15b25a853bf92bfd15
>
> do_configure() {
> cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
> @@ -80,6 +85,7 @@ do_configure() {
> cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> oe_runconf
> rm config.log
> - sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> + #sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
> sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
> + sed -i -e s:'${top_builddir_slash}libtool':${TARGET_ARCH}-${DISTRO}-${TARGET_OS}-libtool:g doltlibtool
> }
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> new file mode 100644
> index 0000000..40052d7
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb
> @@ -0,0 +1,19 @@
> +# 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
> +
> +PR = "r6"
Remove old recipe in the same commit and drop PR.
> +
> +# work around build failure
> +EXTRA_OECONF += " --enable-libxml2=no"
> +
> +SRC_URI += "file://0001-enable-subdir-objects.patch \
> + file://0002-glibc-does-not-provide-strlcpy.patch \
> +"
> +
> +SRC_URI[md5sum] = "fb6787ad749aadcfaeab3471939b3426"
> +SRC_URI[sha256sum] = "219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4"
> +
> --
> 1.8.3.2
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
prev parent reply other threads:[~2014-02-25 17:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 16:32 [meta-multimedia][PATCH 0/3] vlc: update to 2.1.2 Tim Orling
2014-02-25 16:32 ` [meta-multimedia][PATCH 1/3] libdvdcss: update to 1.2.13 Tim Orling
2014-02-25 17:17 ` Martin Jansa
2014-02-25 16:32 ` [meta-multimedia][PATCH 2/3] live555: update to 2013.04.30 Tim Orling
2014-02-25 17:17 ` Martin Jansa
2014-02-25 16:32 ` [meta-multimedia][PATCH 3/3] vlc: update to 2.1.2 Tim Orling
2014-02-25 17:19 ` Martin Jansa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140225171954.GQ26981@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.