vlc: update to 2.1.2
cover vlc: update to 2.1.2
From: Tim Orling <[email protected]>
RFC and request for testing :)
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 +++++++++++++++++ .../recipes-multimedia/vlc/libdvdcss_1.2.13.bb | 13 +++++++++++++ meta-multimedia/recipes-multimedia/vlc/vlc.inc | 12 +++++++++--- meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb | 19 +++++++++++++++++++ .../recipes-multimedia/live555/live555_20130430.bb | 9 +++++++++ 6 files changed, 80 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/libdvdcss_1.2.13.bb create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb create mode 100644 meta-oe/recipes-multimedia/live555/live555_20130430.bb
Signature · 1 line
1.8.3.2
PATCH 1/3 libdvdcss: update to 1.2.13
From: Tim Orling <[email protected]>
--- meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb
meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb new file +13 -0
@@ -0,0 +1,13 @@ +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 = "r2" + +SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = " --disable-doc " + +SRC_URI[md5sum] = "53cfc52a60a156763c425572e5179273" +SRC_URI[sha256sum] = "84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c"
Signature · 1 line
1.8.3.2
PATCH 2/3 live555: update to 2013.04.30
In reply to Tim OrlingFrom: Tim Orling <[email protected]>
--- meta-oe/recipes-multimedia/live555/live555_20130430.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 meta-oe/recipes-multimedia/live555/live555_20130430.bb
meta-oe/recipes-multimedia/live555/live555_20130430.bb new file +9 -0
@@ -0,0 +1,9 @@ +require live555.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "95533d91bd196e42fd748076dc244b09" +SRC_URI[sha256sum] = "e549af608c9961d85cb647bc3b99804fec0fbaf5338c1b72d057558ae5cd2aea" +
Signature · 1 line
1.8.3.2
PATCH 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 | 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
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 +9 -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 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 }
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +19 -0
@@ -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 += "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 1/3] libdvdcss: update to 1.2.13
In reply to Tim OrlingQuoted 14 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bbmeta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb new file +0
-0
meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb line 4
Quoted 4 lines
meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb new file +4
-0@@ -0,0 +1,13 @@ +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 = "r2"
Remove old recipe in the same commit and drop PR.
Quoted 16 lines
meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.2.13.bb new file +9
-0+ +SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = " --disable-doc " + +SRC_URI[md5sum] = "53cfc52a60a156763c425572e5179273" +SRC_URI[sha256sum] = "84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c"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 2/3] live555: update to 2013.04.30
In reply to Tim OrlingQuoted 14 lines · Tim Orling
From: Tim Orling <[email protected]>
Signed-off-by Tim Orling <[email protected]>--- meta-oe/recipes-multimedia/live555/live555_20130430.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 meta-oe/recipes-multimedia/live555/live555_20130430.bbmeta-oe/recipes-multimedia/live555/live555_20130430.bb new file +0
-0
meta-oe/recipes-multimedia/live555/live555_20130430.bb line 5
Quoted 5 lines
meta-oe/recipes-multimedia/live555/live555_20130430.bb new file +5
-0@@ -0,0 +1,9 @@ +require live555.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" + +PR = "${INC_PR}.0"
Remove old recipe in the same commit and drop PR.
Quoted 11 lines
meta-oe/recipes-multimedia/live555/live555_20130430.bb new file +4
-0+ +SRC_URI[md5sum] = "95533d91bd196e42fd748076dc244b09" +SRC_URI[sha256sum] = "e549af608c9961d85cb647bc3b99804fec0fbaf5338c1b72d057558ae5cd2aea" +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]
Quoted 62 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 | 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.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 SECTION = "multimedia" · line 14
Quoted 10 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-2-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.
Quoted 14 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3
-0LEAD_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/ \
meta-multimedia/recipes-multimedia/vlc/vlc.inc PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" · line 77
Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-0@@ -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
Quoted 18 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2
-1do_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 }meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +0
-0
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb line 8
Quoted 8 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +8
-0@@ -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.
Quoted 18 lines
meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb new file +11
-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" +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]