[meta-oe][PATCH v5 1/2] libass: add newer version

[meta-oe][PATCH v5 1/2] libass: add newer version

[Abdur Rehman]

* mpv requires newer libass to build
* move SRC_URI from Google Code to GitHub
* ENCA support has been removed https://github.com/libass/libass/pull/197
  remove --enable-enca which is now an [unknown-configure-option]
* Fix [textrel] for x86 targets

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
---
 meta-oe/recipes-multimedia/libass/libass.inc       | 10 +++++-----
 meta-oe/recipes-multimedia/libass/libass_0.10.1.bb |  5 -----
 meta-oe/recipes-multimedia/libass/libass_0.13.2.bb |  4 ++++
 3 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/libass/libass_0.10.1.bb
 create mode 100644 meta-oe/recipes-multimedia/libass/libass_0.13.2.bb

diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc
index 328cd14..85ac873 100644
--- a/meta-oe/recipes-multimedia/libass/libass.inc
+++ b/meta-oe/recipes-multimedia/libass/libass.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. It is mostly compatible with VSFilter."
-HOMEPAGE = "http://code.google.com/p/libass/"
+HOMEPAGE = "https://github.com/libass/libass"
 SECTION = "libs/multimedia"
 
 LICENSE = "ISC"
@@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ae98663bac55afe5d989919d296f28a"
 
 DEPENDS = "enca fontconfig freetype libpng fribidi"
 
-INC_PR = "r1"
-
-SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz"
+SRC_URI = "https://github.com/libass/libass/releases/download/${PV}/libass-${PV}.tar.xz"
 
 inherit autotools pkgconfig
 
@@ -17,10 +15,12 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz"
 
 EXTRA_OECONF = " \
-    --enable-enca \
     --enable-fontconfig \
 "
 
+# Disable compiling with ASM for x86 to avoid textrel
+EXTRA_OECONF_append_x86 = " --disable-asm"
+
 PACKAGES =+ "${PN}-tests"
 
 FILES_${PN}-tests = " \
diff --git a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb b/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb
deleted file mode 100644
index 0b32276..0000000
--- a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "6cace482a013a3c4bf3b31a68ac66026"
-SRC_URI[sha256sum] = "629a7e81fff92dea8d0399b818a41fd1b61e381c67a5961b1eaec2efadb14c6c"
diff --git a/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb b/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb
new file mode 100644
index 0000000..8cf2bd8
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libass/libass_0.13.2.bb
@@ -0,0 +1,4 @@
+require recipes-multimedia/${BPN}/${BPN}.inc
+
+SRC_URI[md5sum] = "1c8cbd5751aeb192bda04a65d0464fd9"
+SRC_URI[sha256sum] = "d698d0a6adca7c36c5a86b540d67b05bfd36cebc3c351ab7646497c43fe1face"
-- 
1.9.1

[meta-oe][PATCH v5 2/2] mpv: Media Player

[Abdur Rehman]

mpv is a fork of mplayer2 and MPlayer. It shares some features with
the former projects while introducing many more.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
---
 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 69 ++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb

diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
new file mode 100644
index 0000000..4f4aec1
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
@@ -0,0 +1,69 @@
+SUMMARY = "Open Source multimedia player"
+SECTION = "multimedia"
+HOMEPAGE = "http://www.mpv.io/"
+DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \
+           libxscrnsaver libv4l libxinerama \
+"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb"
+
+SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
+           http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \
+"
+SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101"
+SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc"
+SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71"
+SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
+
+inherit pkgconfig pythonnative distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+# Note: both lua and libass are required to get on-screen-display (controls)
+PACKAGECONFIG ??= "lua libass"
+PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
+PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
+PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
+PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
+
+EXTRA_OECONF = " \
+    --prefix=${prefix} \
+    --target=${SIMPLE_TARGET_SYS} \
+    --confdir=${sysconfdir} \
+    --datadir=${datadir} \
+    --disable-manpage-build \
+    --disable-gl \
+    --disable-libsmbclient \
+    --disable-encoding \
+    --disable-libbluray \
+    --disable-dvdread \
+    --disable-dvdnav \
+    --disable-cdda \
+    --disable-enca \
+    --disable-libguess \
+    --disable-uchardet \
+    --disable-rubberband \
+    --disable-lcms2 \
+    --disable-vapoursynth \
+    --disable-vapoursynth-lazy \
+"
+
+do_configure() {
+    if [ ! -L ../waf ]; then
+        chmod a+x ../waf-1.8.12
+	ln -s waf-1.8.12 ../waf
+    fi
+    export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
+    ../waf configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+    ../waf build
+}
+
+do_install() {
+    ../waf install --destdir=${D}
+}
+
+FILES_${PN} += "${datadir}/icons"
-- 
1.9.1

Re: [meta-oe][PATCH v5 2/2] mpv: Media Player

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 3428 bytes --]


> On Jun 7, 2016, at 5:01 AM, Abdur Rehman <abdur_rehman@mentor.com> wrote:
> 
> mpv is a fork of mplayer2 and MPlayer. It shares some features with
> the former projects while introducing many more.
> 
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
> ---
> meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 69 ++++++++++++++++++++++++
> 1 file changed, 69 insertions(+)
> create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
> 
> diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
> new file mode 100644
> index 0000000..4f4aec1
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
> @@ -0,0 +1,69 @@
> +SUMMARY = "Open Source multimedia player"
> +SECTION = "multimedia"
> +HOMEPAGE = "http://www.mpv.io/"
> +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \
> +           libxscrnsaver libv4l libxinerama \
> +"
> +
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb"
> +
> +SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
> +           http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \
> +"
> +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101"
> +SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc"
> +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71"
> +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
> +
> +inherit pkgconfig pythonnative distro_features_check
> +# depends on virtual/libx11
> +REQUIRED_DISTRO_FEATURES = "x11"
> +
> +# Note: both lua and libass are required to get on-screen-display (controls)
> +PACKAGECONFIG ??= "lua libass"
> +PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
> +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
> +PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
> +PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
> +
> +EXTRA_OECONF = " \
> +    --prefix=${prefix} \
> +    --target=${SIMPLE_TARGET_SYS} \
> +    --confdir=${sysconfdir} \
> +    --datadir=${datadir} \
> +    --disable-manpage-build \
> +    --disable-gl \
> +    --disable-libsmbclient \
> +    --disable-encoding \
> +    --disable-libbluray \
> +    --disable-dvdread \
> +    --disable-dvdnav \
> +    --disable-cdda \
> +    --disable-enca \
> +    --disable-libguess \
> +    --disable-uchardet \
> +    --disable-rubberband \
> +    --disable-lcms2 \
> +    --disable-vapoursynth \
> +    --disable-vapoursynth-lazy \
> +"
> +
> +do_configure() {
> +    if [ ! -L ../waf ]; then
> +        chmod a+x ../waf-1.8.12
> +	ln -s waf-1.8.12 ../waf
> +    fi
> +    export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
> +    ../waf configure ${EXTRA_OECONF}
> +}
> +
> +do_compile () {
> +    ../waf build
> +}
> +
> +do_install() {
> +    ../waf install --destdir=${D}
> +}

may be you should inherit waf

> +
> +FILES_${PN} += "${datadir}/icons"
> --
> 1.9.1
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [meta-oe][PATCH v5 2/2] mpv: Media Player

[Gary Thomas]

On 2016-06-22 19:06, Khem Raj wrote:
>
>> On Jun 7, 2016, at 5:01 AM, Abdur Rehman <abdur_rehman@mentor.com> wrote:
>>
>> mpv is a fork of mplayer2 and MPlayer. It shares some features with
>> the former projects while introducing many more.
>>
>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>> Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
>> ---
>> meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb | 69 ++++++++++++++++++++++++
>> 1 file changed, 69 insertions(+)
>> create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
>>
>> diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
>> new file mode 100644
>> index 0000000..4f4aec1
>> --- /dev/null
>> +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb
>> @@ -0,0 +1,69 @@
>> +SUMMARY = "Open Source multimedia player"
>> +SECTION = "multimedia"
>> +HOMEPAGE = "http://www.mpv.io/"
>> +DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \
>> +           libxscrnsaver libv4l libxinerama \
>> +"
>> +
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb"
>> +
>> +SRC_URI = "https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
>> +           http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf \
>> +"
>> +SRC_URI[mpv.md5sum] = "9042bd3fbff2bc8ba0b7fadaa4a22101"
>> +SRC_URI[mpv.sha256sum] = "7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc"
>> +SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71"
>> +SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
>> +
>> +inherit pkgconfig pythonnative distro_features_check
>> +# depends on virtual/libx11
>> +REQUIRED_DISTRO_FEATURES = "x11"
>> +
>> +# Note: both lua and libass are required to get on-screen-display (controls)
>> +PACKAGECONFIG ??= "lua libass"
>> +PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
>> +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
>> +PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
>> +PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
>> +
>> +EXTRA_OECONF = " \
>> +    --prefix=${prefix} \
>> +    --target=${SIMPLE_TARGET_SYS} \
>> +    --confdir=${sysconfdir} \
>> +    --datadir=${datadir} \
>> +    --disable-manpage-build \
>> +    --disable-gl \
>> +    --disable-libsmbclient \
>> +    --disable-encoding \
>> +    --disable-libbluray \
>> +    --disable-dvdread \
>> +    --disable-dvdnav \
>> +    --disable-cdda \
>> +    --disable-enca \
>> +    --disable-libguess \
>> +    --disable-uchardet \
>> +    --disable-rubberband \
>> +    --disable-lcms2 \
>> +    --disable-vapoursynth \
>> +    --disable-vapoursynth-lazy \
>> +"
>> +
>> +do_configure() {
>> +    if [ ! -L ../waf ]; then
>> +        chmod a+x ../waf-1.8.12
>> +	ln -s waf-1.8.12 ../waf
>> +    fi
>> +    export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
>> +    ../waf configure ${EXTRA_OECONF}
>> +}
>> +
>> +do_compile () {
>> +    ../waf build
>> +}
>> +
>> +do_install() {
>> +    ../waf install --destdir=${D}
>> +}
>
> may be you should inherit waf

I didn't make it, but there was a recent Vn patchset that does.

>
>> +
>> +FILES_${PN} += "${datadir}/icons"
>> --
>> 1.9.1

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------