Skip to contentSkip to conversation

aom: Upgrade to 3.4.0

PATCH New Khem Raj 1 participant 3 messages Aug 27, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 aom: Upgrade to 3.4.0

This fix brings in following changes [1]
Add -D_GNU_SOURCE on musl to fix ftello()

[1] https://aomedia.googlesource.com/aom/+/refs/tags/v3.4.0

---
 .../recipes-multimedia/aom/{aom_3.0.0.bb => aom_3.4.0.bb}    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta-multimedia/recipes-multimedia/aom/{aom_3.0.0.bb => aom_3.4.0.bb} (87%)
meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb renamed from meta-multimedia/recipes-multimedia/aom/aom_3.0.0.bb +3 -2
similarity index 87%
rename from meta-multimedia/recipes-multimedia/aom/aom_3.0.0.bb
rename to meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb
index 778dc192c8..36db45e265 100644
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \
                     file://PATENTS;md5=e69ad12202bd20da3c76a5d3648cfa83 \
                    "
 
-SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=master"
+SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main"
 
-SRCREV = "307ce06ed82d93885ee8ed53e152c9268ac0d98d"
+SRCREV = "fd0c9275d36930a6eea6d3c35972e7cf9c512944"
 
 S = "${WORKDIR}/git"
 
@@ -19,4 +19,5 @@ EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \
                   -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \
                 "
 
+CFLAGS:append:libc-musl = " -D_GNU_SOURCE"
 EXTRA_OECMAKE:append:arm = " ${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}"
Signature · 1 line
2.37.2
author
#1 lore raw

PATCH 2/3 vorbis-tools: Fix build on musl

---
 ...clude-utf8.h-for-missing-utf8_decode.patch | 27 +++++++++++++++++++
 .../vorbis-tools/vorbis-tools_1.4.2.bb        |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch
meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch new file +27 -0
new file mode 100644
index 0000000000..36a31a85cd
@@ -0,0 +1,27 @@
+From 8c10181547c93438fc10f753e7164ee004add6d1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 27 Aug 2022 10:28:47 -0700
+Subject: [PATCH] ogginfo: Include utf8.h for missing utf8_decode
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ ogginfo/codec_skeleton.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ogginfo/codec_skeleton.c b/ogginfo/codec_skeleton.c
+index a27f8da..3ac13f6 100644
+--- a/ogginfo/codec_skeleton.c
++++ b/ogginfo/codec_skeleton.c
+@@ -25,6 +25,7 @@
+ #include <ogg/ogg.h>
+ 
+ #include "i18n.h"
++#include "utf8.h" /* utf8_decode */
+ 
+ #include "private.h"
+ 
+-- 
+2.37.2
+
meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb +1 -0
index 290162127f..61a4aedb85 100644
@@ -12,6 +12,7 @@ DEPENDS = "libogg libvorbis"
 
 SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \
            file://gettext.patch \
+           file://0001-ogginfo-Include-utf8.h-for-missing-utf8_decode.patch \
           "
 
 SRC_URI[md5sum] = "998fca293bd4e4bdc2b96fb70f952f4e"
Signature · 1 line
2.37.2
author
#2 lore raw

PATCH 3/3 dvb-apps: Use tarball for SRC_URI and fix build on musl

In reply to Khem Raj

Convert to using tarball for SRC_URI, this is only recipe in meta-openembedded needing mercurial fetcher

Fix the stime replacement patch to fix type errors on time_t

| dvbdate.c:313:12: error: incompatible pointer to integer conversion assigning to 'time_t' (aka 'long') from 'time_t **' (aka 'long **') [-Wint-conversion]
|         ts.tv_sec = &new_time;
|                   ^ ~~~~~~~~~
---
 ...b-apps_1.1.1.bb => dvb-apps_1.1.1.20140321.bb} |  7 +++----
 ...dvbdate-Remove-Obsoleted-stime-API-calls.patch | 15 +++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)
 rename meta-multimedia/recipes-multimedia/dvb-apps/{dvb-apps_1.1.1.bb => dvb-apps_1.1.1.20140321.bb} (94%)
meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb renamed from meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +3 -4
similarity index 94%
rename from meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb
rename to meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb
index 98970d5b71..90a69e5e23 100644
@@ -2,9 +2,8 @@ SUMMARY = "Linux DVB API applications and utilities"
 HOMEPAGE = "http://www.linuxtv.org"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRCREV = "3d43b280298c39a67d1d889e01e173f52c12da35"
 
-SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \
+SRC_URI = "https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2;downloadfilename=${BPN}-3d43b280298c.tar.bz2 \
           file://dvb-scan-table \
           file://0001-Fix-generate-keynames.patch \
           file://0003-handle-static-shared-only-build.patch \
@@ -13,8 +12,8 @@ SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \
           file://0006-CA_SET_PID.patch \
           file://0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch \
           "
-
-S = "${WORKDIR}/${BPN}"
+SRC_URI[sha256sum] = "f39e2f0ebed7e32bce83522062ad4d414f67fccd5df1b647618524497e15e057"
+S = "${WORKDIR}/${BPN}-3d43b280298c"
 
 inherit perlnative
 
meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch +5 -10
index 9035b56f4a..e89f9a3cdc 100644
@@ -11,22 +11,17 @@ Signed-off-by: Khem Raj <[email protected]>
  util/dvbdate/dvbdate.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/util/dvbdate/dvbdate.c b/util/dvbdate/dvbdate.c
-index f0df437..492ed79 100644
 --- a/util/dvbdate/dvbdate.c
 +++ b/util/dvbdate/dvbdate.c
-@@ -309,7 +309,10 @@ int atsc_scan_date(time_t *rx_time, unsigned int to)
+@@ -309,7 +309,10 @@ int atsc_scan_date(time_t *rx_time, unsi
   */
  int set_time(time_t * new_time)
  {
 -	if (stime(new_time)) {
-+	struct timespec ts;
-+	ts.tv_sec = &new_time;
-+	ts.tv_nsec = 0;
-+	if (clock_settime(CLOCK_REALTIME, &ts)) {
++	struct timespec s = {0};
++	s.tv_sec = *new_time;
++
++	if (clock_settime(CLOCK_REALTIME, &s)) {
  		perror("Unable to set time");
  		return -1;
  	}
--- 
-2.24.1
-
Signature · 1 line
2.37.2