All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/orc: bump to version 0.4.33
@ 2022-12-23 22:01 Fabrice Fontaine
  2022-12-27 20:50 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-12-23 22:01 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Drop patch (already in version)

https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.33/RELEASE

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...powerpc.c-fix-build-with-kernel-4.11.patch | 70 -------------------
 package/orc/orc.hash                          |  4 +-
 package/orc/orc.mk                            |  2 +-
 3 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch

diff --git a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch b/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch
deleted file mode 100644
index 0a4e7010f2..0000000000
--- a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 15 Feb 2021 20:17:43 +0100
-Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11
-
-Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and
-https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235:
-
-FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o
-/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c
-../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv':
-../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'?
-  164 |       if (buf[i] == AT_L1D_CACHESIZE) {
-      |                     ^~~~~~~~~~~~~~~~
-      |                     AT_DCACHEBSIZE
-../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in
-../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'?
-  168 |       if (buf[i] == AT_L2_CACHESIZE) {
-      |                     ^~~~~~~~~~~~~~~
-      |                     AT_ICACHEBSIZE
-../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'?
-  172 |       if (buf[i] == AT_L3_CACHESIZE) {
-      |                     ^~~~~~~~~~~~~~~
-      |                     AT_ICACHEBSIZE
-
-Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and
-https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147
-
-Fixes:
- - http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56]
----
- orc/orccpu-powerpc.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c
-index 6796f17..340cf05 100644
---- a/orc/orccpu-powerpc.c
-+++ b/orc/orccpu-powerpc.c
-@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void)
-         _orc_cpu_name = (char*)buf[i + 1];
-         found++;
-       }
-+#ifdef AT_L1D_CACHESIZE
-       if (buf[i] == AT_L1D_CACHESIZE) {
-         _orc_data_cache_size_level1 = buf[i + 1];
-         found++;
-       }
-+#endif
-+#ifdef AT_L2_CACHESIZE
-       if (buf[i] == AT_L2_CACHESIZE) {
-         _orc_data_cache_size_level2 = buf[i + 1];
-         found++;
-       }
-+#endif
-+#ifdef AT_L3_CACHESIZE
-       if (buf[i] == AT_L3_CACHESIZE) {
-         _orc_data_cache_size_level3 = buf[i + 1];
-         found++;
-       }
-+#endif
-       if (found == 6)
-         break;
-     }
--- 
-2.30.0
-
diff --git a/package/orc/orc.hash b/package/orc/orc.hash
index f48c2932ab..136fc3ece4 100644
--- a/package/orc/orc.hash
+++ b/package/orc/orc.hash
@@ -1,5 +1,5 @@
-# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz.sha256sum
-sha256  a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0  orc-0.4.32.tar.xz
+# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum
+sha256  844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a  orc-0.4.33.tar.xz
 
 # Locally calculated
 sha256  4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf  COPYING
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index a93a4f875a..be718e6f85 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ORC_VERSION = 0.4.32
+ORC_VERSION = 0.4.33
 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz
 ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc
 ORC_LICENSE = BSD-2-Clause, BSD-3-Clause
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/orc: bump to version 0.4.33
  2022-12-23 22:01 [Buildroot] [PATCH 1/1] package/orc: bump to version 0.4.33 Fabrice Fontaine
@ 2022-12-27 20:50 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-12-27 20:50 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

On Fri, 23 Dec 2022 23:01:00 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Drop patch (already in version)
> 
> https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.33/RELEASE
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...powerpc.c-fix-build-with-kernel-4.11.patch | 70 -------------------
>  package/orc/orc.hash                          |  4 +-
>  package/orc/orc.mk                            |  2 +-
>  3 files changed, 3 insertions(+), 73 deletions(-)
>  delete mode 100644 package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-12-27 20:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-23 22:01 [Buildroot] [PATCH 1/1] package/orc: bump to version 0.4.33 Fabrice Fontaine
2022-12-27 20:50 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.