mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-11 04:49:58 +00:00
mpv: Upgrade to 0.38.0 release
https://github.com/mpv-player/mpv/releases migrate to using meson build system Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+33
@@ -0,0 +1,33 @@
|
|||||||
|
From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Thu, 29 Aug 2024 17:54:15 -0700
|
||||||
|
Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated
|
||||||
|
sources
|
||||||
|
|
||||||
|
These sources are bundled into src packages to be distributed and leaking
|
||||||
|
buildpaths results in violating reproducibility norms.
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763]
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
TOOLS/file2string.py | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py
|
||||||
|
index 5b1c4a95d1..39c1122a35 100755
|
||||||
|
--- a/TOOLS/file2string.py
|
||||||
|
+++ b/TOOLS/file2string.py
|
||||||
|
@@ -22,10 +22,10 @@
|
||||||
|
# License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
-import sys
|
||||||
|
+import os, sys
|
||||||
|
|
||||||
|
def file2string(infilename, infile, outfile):
|
||||||
|
- outfile.write("// Generated from %s\n\n" % infilename)
|
||||||
|
+ outfile.write("// Generated from %s\n\n" % os.path.basename(infilename))
|
||||||
|
|
||||||
|
conv = ["\\%03o" % c for c in range(256)]
|
||||||
|
safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \
|
||||||
+35
-44
@@ -9,20 +9,20 @@ DEPENDS = " \
|
|||||||
jpeg \
|
jpeg \
|
||||||
libv4l \
|
libv4l \
|
||||||
libass \
|
libass \
|
||||||
|
libplacebo \
|
||||||
"
|
"
|
||||||
|
|
||||||
LICENSE = "GPL-2.0-or-later"
|
LICENSE = "GPL-2.0-or-later"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
|
|
||||||
SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239"
|
SRCREV_mpv = "02254b92dd237f03aa0a151c2a68778c4ea848f9"
|
||||||
SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \
|
SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.38;protocol=https \
|
||||||
https://waf.io/waf-2.0.25;name=waf;subdir=git \
|
file://0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit waf pkgconfig mime-xdg
|
inherit meson pkgconfig mime-xdg
|
||||||
|
|
||||||
LDFLAGS:append:riscv64 = " -latomic"
|
LDFLAGS:append:riscv64 = " -latomic"
|
||||||
|
|
||||||
@@ -42,59 +42,55 @@ PACKAGECONFIG ??= " \
|
|||||||
${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
|
${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
|
||||||
"
|
"
|
||||||
|
|
||||||
PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
|
PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=diabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
|
||||||
PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv"
|
PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv"
|
||||||
PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
|
PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl"
|
||||||
PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
|
PACKAGECONFIG[egl] = "-Degl=enabled,-Degl-disabled,virtual/egl"
|
||||||
PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
|
PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm"
|
||||||
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm"
|
PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm"
|
||||||
PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
|
PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,lua luajit"
|
||||||
PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
|
PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
|
||||||
PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
|
PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
|
||||||
PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
|
PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
|
||||||
PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
|
PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
|
||||||
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon"
|
PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
|
||||||
|
|
||||||
python __anonymous() {
|
python __anonymous() {
|
||||||
packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
|
packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
|
||||||
extras = []
|
extras = []
|
||||||
if "x11" in packageconfig and "opengl" in packageconfig:
|
if "x11" in packageconfig and "opengl" in packageconfig:
|
||||||
extras.append(" --enable-gl-x11")
|
extras.append(" -Dgl-x11=enabled")
|
||||||
if "x11" in packageconfig and "egl" in packageconfig:
|
if "x11" in packageconfig and "egl" in packageconfig:
|
||||||
extras.append(" --enable-egl-x11")
|
extras.append(" -Degl-x11=enabled")
|
||||||
if "egl" in packageconfig and "drm" in packageconfig:
|
if "egl" in packageconfig and "drm" in packageconfig:
|
||||||
extras.append(" --enable-egl-drm")
|
extras.append(" -Degl-drm=enabled")
|
||||||
if "vaapi" in packageconfig and "x11" in packageconfig:
|
if "vaapi" in packageconfig and "x11" in packageconfig:
|
||||||
extras.append(" --enable-vaapi-x11")
|
extras.append(" -Dvaapi-x11=enabled")
|
||||||
if "vaapi" in packageconfig and "drm" in packageconfig:
|
if "vaapi" in packageconfig and "drm" in packageconfig:
|
||||||
extras.append(" --enable-vaapi-drm")
|
extras.append(" -Dvaapi-drm=enabled")
|
||||||
if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
|
if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
|
||||||
extras.append(" --enable-vaapi-x-egl")
|
extras.append(" -Dvaapi-x-egl=enabled")
|
||||||
if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
|
if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
|
||||||
extras.append(" --enable-vdpau-gl-x11")
|
extras.append(" -Dvdpau-gl-x11=enabled")
|
||||||
if "wayland" in packageconfig and "opengl" in packageconfig:
|
if "wayland" in packageconfig and "opengl" in packageconfig:
|
||||||
extras.append(" --enable-gl-wayland")
|
extras.append(" -Dgl-wayland=enabled")
|
||||||
if "wayland" in packageconfig and "vaapi" in packageconfig:
|
if "wayland" in packageconfig and "vaapi" in packageconfig:
|
||||||
extras.append(" --enable-vaapi-wayland")
|
extras.append(" -Dvaapi-wayland=enabled")
|
||||||
if extras:
|
if extras:
|
||||||
d.appendVar("EXTRA_OECONF", "".join(extras))
|
d.appendVar("EXTRA_OECONF", "".join(extras))
|
||||||
}
|
}
|
||||||
|
|
||||||
SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
|
#SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
|
||||||
|
|
||||||
EXTRA_OECONF = " \
|
EXTRA_OECONF = " \
|
||||||
--prefix=${prefix} \
|
-Dmanpage-build=disabled \
|
||||||
--target=${SIMPLE_TARGET_SYS} \
|
-Dlibbluray=disabled \
|
||||||
--confdir=${sysconfdir} \
|
-Ddvdnav=disabled \
|
||||||
--datadir=${datadir} \
|
-Dcdda=disabled \
|
||||||
--disable-manpage-build \
|
-Duchardet=disabled \
|
||||||
--disable-libbluray \
|
-Drubberband=disabled \
|
||||||
--disable-dvdnav \
|
-Dlcms2=disabled \
|
||||||
--disable-cdda \
|
-Dvapoursynth=disabled \
|
||||||
--disable-uchardet \
|
|
||||||
--disable-rubberband \
|
|
||||||
--disable-lcms2 \
|
|
||||||
--disable-vapoursynth \
|
|
||||||
${PACKAGECONFIG_CONFARGS} \
|
${PACKAGECONFIG_CONFARGS} \
|
||||||
"
|
"
|
||||||
|
|
||||||
@@ -102,11 +98,6 @@ do_configure:append() {
|
|||||||
sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h
|
sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h
|
||||||
}
|
}
|
||||||
|
|
||||||
link_waf() {
|
|
||||||
ln -s waf-2.0.25 ${S}/waf
|
|
||||||
}
|
|
||||||
do_unpack[postfuncs] += "link_waf"
|
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${datadir}/icons \
|
${datadir}/icons \
|
||||||
${datadir}/zsh \
|
${datadir}/zsh \
|
||||||
Reference in New Issue
Block a user