[oe] [meta-multimedia][PATCH 3/3] vlc: update to 2.1.2

2014-02-25 Thread Tim Orling 
From: Tim Orling ticot...@gmail.com

Signed-off-by: Tim Orling ticot...@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 000..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 000..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
 
 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
 
 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 000..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
+
+# work around build failure
+EXTRA_OECONF +=  --enable-libxml2=no
+
+SRC_URI +=

Re: [oe] [meta-multimedia][PATCH 3/3] vlc: update to 2.1.2

2014-02-25 Thread Martin Jansa 
On Tue, Feb 25, 2014 at 08:32:55AM -0800, Tim Orling wrote:
 From: Tim Orling ticot...@gmail.com
 
 Signed-off-by: Tim Orling ticot...@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 000..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 000..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 000..40052d7
 --- /dev/null