Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade recipes multimedia and imx-lib to BSP LF6.6.36_2.1.0 #2002

Merged
merged 6 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes-bsp/imx-lib/imx-lib_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PE = "1"
PV = "5.9+${SRCPV}"

SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "lf-6.6.23_2.0.0"
SRCBRANCH = "lf-6.6.36_2.1.0"
SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"

S = "${WORKDIR}/git"
Expand Down
2 changes: 1 addition & 1 deletion recipes-multimedia/alsa/imx-alsa-plugins_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers
PV = "1.0.26+${SRCPV}"

SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"

S = "${WORKDIR}/git"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch"
GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCREV = "869cef4efbc004c795392d274e617f2dfa71ac98"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd"

S = "${WORKDIR}/git"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ SRC_URI:remove = " \
SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "

GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCREV = "1c9913d7ce81c43cbf756158a35f61dbeee19ea3"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7"

S = "${WORKDIR}/git"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu

SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCREV = "50535da48c564bd3a46b2e39e0a3a97cf7e86df3"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af"

# set 32bit compile timer for 32-bit platform
GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
Expand Down
4 changes: 2 additions & 2 deletions recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ LIC_FILES_CHKSUM = " \
SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCREV = "753c7b4471d14befd1b7c9cd3fa9af9f10ab4a08"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "eb286c0766a4fbbae70c8e9dda074f5a90e52e42"

S = "${WORKDIR}/git"

Expand Down

This file was deleted.

10 changes: 4 additions & 6 deletions recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ RREPLACES:${PN} = "gst1.0-fsl-plugin"
RPROVIDES:${PN} = "gst1.0-fsl-plugin"
RCONFLICTS:${PN} = "gst1.0-fsl-plugin"

PV = "4.9.0+git${SRCPV}"
PV = "4.9.1+git${SRCPV}"

SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \
"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCREV = "c3049a137f79e4eabc98785aefcd217ebcde9e96"
SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "87135d5f084b6c61efa6671cddc3a5509ab11640"

S = "${WORKDIR}/git"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Copyright 2023 NXP
# Copyright 2023-2024 NXP
DESCRIPTION = "NXP Multimedia opencl converter lib"
LICENSE = "Proprietary"
SECTION = "multimedia"
LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
DEPENDS = "virtual/opencl-icd"

SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
IMX_SRCREV_ABBREV = "efe25d6"
IMX_SRCREV_ABBREV = "f2c3930"

SRC_URI[md5sum] = "daa99b8615ca08280833bb80bc52c9be"
SRC_URI[sha256sum] = "1717f7fe64b260156b8d5b353add5edb7bc0217dd3847ac641601d4a59494f08"
SRC_URI[md5sum] = "c57b978d29bf136be3523676ad088b07"
SRC_URI[sha256sum] = "eb3df72a7e1d16ec1660978cf36b7818b8ac7c7defe3222ae4bb7dabd4a5f4cc"

S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
inherit fsl-eula-unpack autotools pkgconfig meson
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
DESCRIPTION = "Freescale Multimedia parser libs"
LICENSE = "Proprietary"
SECTION = "multimedia"
LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"

# For backwards compatibility
PROVIDES += "libfslparser"
RREPLACES:${PN} = "libfslparser"
RPROVIDES:${PN} = "libfslparser"
RCONFLICTS:${PN} = "libfslparser"

SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
SRC_URI[md5sum] = "700b4cf3ba547dc740a064787f528af0"
SRC_URI[sha256sum] = "2f0fc3955f824936c359b3cb738549213823b0c366b2362bba593058da745677"
SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
IMX_SRCREV_ABBREV = "5d91190"
S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}"

SRC_URI[md5sum] = "086773073ed8fba17eab80b35a740a46"
SRC_URI[sha256sum] = "087badea414540d1b9403be1a0c7fc91ac42a61f0374857972cd06d8c392ddec"

inherit fsl-eula-unpack autotools pkgconfig

Expand Down
6 changes: 3 additions & 3 deletions recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
DESCRIPTION = "Freescale Multimedia VPU wrapper"
LICENSE = "Proprietary"
SECTION = "multimedia"
LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"

DEPENDS = "virtual/imxvpu"
DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
Expand All @@ -15,8 +15,8 @@ SRC_URI = " \
file://0001-vpu_wrapper_hantro_encoder-add-sys-time.h-for-gettim.patch \
file://0001-vpu_wrapper_hantro_VCencoder-add-sys-time.h-for-gett.patch \
"
SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
SRCREV = "73093da30dc4053c9f69813a6447091bfca5429b"
SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
SRCREV = "c13069d239cae314adc3651df25b96afa46cb434"

S = "${WORKDIR}/git"

Expand Down
Loading