From 8b1805ff1b690f1db172d9c62ddc37162f3ded87 Mon Sep 17 00:00:00 2001 From: alperak Date: Sun, 12 Nov 2023 16:37:06 +0300 Subject: libmatroska: upgrade 1.4.1 -> 1.7.1 Changelog: https://github.com/Matroska-Org/libmatroska/blob/v1.x/NEWS.md Signed-off-by: alperak Signed-off-by: Khem Raj --- ...1-Makefile-Use-LINKFLAGS-during-link-step.patch | 29 ----------------- .../recipes-mkv/libmatroska/libmatroska_1.4.1.bb | 37 ---------------------- .../recipes-mkv/libmatroska/libmatroska_1.7.1.bb | 16 ++++++++++ 3 files changed, 16 insertions(+), 66 deletions(-) delete mode 100644 meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch delete mode 100644 meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb create mode 100644 meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch deleted file mode 100644 index f7656913b..000000000 --- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f0c879097c331d1dabe6ee92b583a8badb62ea6d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 18 Mar 2017 08:26:35 -0700 -Subject: [PATCH] Makefile: Use LINKFLAGS during link step - -Adds much needed GNU_HASH section into the .so - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - make/linux/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/make/linux/Makefile b/make/linux/Makefile -index 3ca7b0f..b5c9645 100644 ---- a/make/linux/Makefile -+++ b/make/linux/Makefile -@@ -104,7 +104,7 @@ $(LIBRARY): $(objects) - $(RANLIB) $@ - - $(LIBRARY_SO): $(objects_so) -- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml -+ $(CXX) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml - rm -f $(LIBRARY_SO) - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) - --- -2.12.0 - diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb deleted file mode 100644 index 890be6926..000000000 --- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "libmatroska is a C++ libary to parse Matroska files (.mkv and .mka)" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libebml" - -SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Makefile-Use-LINKFLAGS-during-link-step.patch \ - " -SRC_URI[md5sum] = "f61b2e5086f4bb9d24a43cc8af43a719" -SRC_URI[sha256sum] = "086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile() { - cd ${S}/make/linux - oe_runmake CROSS="${TARGET_PREFIX}" -} - -do_install() { - cd ${S}/make/linux - - install -d ${D}${libdir} - install -m 0644 libmatroska.a ${D}${libdir} - install -m 0755 libmatroska.so.* ${D}${libdir} - cp -R --no-dereference --preserve=mode,links -v libmatroska.so ${D}${libdir} - - install -d ${D}${includedir}/matroska - for i in ../../matroska/*.h; do - install -m 0644 $i ${D}${includedir}/matroska - done - - install -d ${D}${includedir}/matroska/c - for i in ../../matroska/c/*.h; do - install -m 0644 $i ${D}${includedir}/matroska/c - done -} diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb new file mode 100644 index 000000000..16862e690 --- /dev/null +++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "C++ library to parse and create Matroska files(.mkv and .mka)" +HOMEPAGE = "https://github.com/Matroska-Org/libmatroska" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libebml" + +SRC_URI = "git://github.com/Matroska-Org/libmatroska.git;branch=v1.x;protocol=https" +SRCREV = "f5315fddda2d434e47035c038549a808d8b8eac7" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +#Static library enabled by default. It has been added in case you want to use it dynamically. +#EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" -- cgit v1.2.3-54-g00ecf