* [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2
@ 2024-08-05 17:19 Bernd Kuhls
2024-08-05 20:41 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2024-08-05 17:19 UTC (permalink / raw)
To: buildroot; +Cc: Mahyar Koshkouei
Rebased patch 0003.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 5 +++--
package/ffmpeg/ffmpeg.hash | 2 +-
package/ffmpeg/ffmpeg.mk | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
index a52d7fc347..aeb272c459 100644
--- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
+++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
@@ -10,7 +10,8 @@ Fixes https://trac.ffmpeg.org/ticket/9138
Patch sent upstream:
http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: rebased for version 6.1.2]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
@@ -23,9 +24,9 @@ index a89cfa6d959d..6ec00df75312 100755
--- a/configure
+++ b/configure
@@ -2227,6 +2227,7 @@ HEADERS_LIST="
- opencv2_core_core_c_h
OpenGL_gl3_h
poll_h
+ pthread_np_h
+ sys_auxv_h
sys_param_h
sys_resource_h
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index f70ff5da83..630bd70c56 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968 ffmpeg-6.1.1.tar.xz
+sha256 3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 ffmpeg-6.1.2.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 5b2d33883d..19c270a14b 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 6.1.1
+FFMPEG_VERSION = 6.1.2
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = https://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2
@ 2024-08-05 19:08 Bernd Kuhls
2024-08-05 20:42 ` Thomas Petazzoni via buildroot
2024-09-03 19:00 ` Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Bernd Kuhls @ 2024-08-05 19:08 UTC (permalink / raw)
To: buildroot; +Cc: Mahyar Koshkouei
Rebased patch 0003.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 5 +++--
package/ffmpeg/ffmpeg.hash | 2 +-
package/ffmpeg/ffmpeg.mk | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
index a52d7fc347..aeb272c459 100644
--- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
+++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
@@ -10,7 +10,8 @@ Fixes https://trac.ffmpeg.org/ticket/9138
Patch sent upstream:
http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: rebased for version 6.1.2]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
@@ -23,9 +24,9 @@ index a89cfa6d959d..6ec00df75312 100755
--- a/configure
+++ b/configure
@@ -2227,6 +2227,7 @@ HEADERS_LIST="
- opencv2_core_core_c_h
OpenGL_gl3_h
poll_h
+ pthread_np_h
+ sys_auxv_h
sys_param_h
sys_resource_h
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index f70ff5da83..630bd70c56 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968 ffmpeg-6.1.1.tar.xz
+sha256 3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 ffmpeg-6.1.2.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 5b2d33883d..19c270a14b 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 6.1.1
+FFMPEG_VERSION = 6.1.2
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = https://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2
2024-08-05 17:19 [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2 Bernd Kuhls
@ 2024-08-05 20:41 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-08-05 20:41 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Mahyar Koshkouei, buildroot
On Mon, 5 Aug 2024 19:19:47 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> Rebased patch 0003.
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 5 +++--
> package/ffmpeg/ffmpeg.hash | 2 +-
> package/ffmpeg/ffmpeg.mk | 2 +-
> 3 files changed, 5 insertions(+), 4 deletions(-)
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] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2
2024-08-05 19:08 Bernd Kuhls
@ 2024-08-05 20:42 ` Thomas Petazzoni via buildroot
2024-09-03 19:00 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-08-05 20:42 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Mahyar Koshkouei, buildroot
On Mon, 5 Aug 2024 21:08:13 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> Rebased patch 0003.
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 5 +++--
> package/ffmpeg/ffmpeg.hash | 2 +-
> package/ffmpeg/ffmpeg.mk | 2 +-
> 3 files changed, 5 insertions(+), 4 deletions(-)
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] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2
2024-08-05 19:08 Bernd Kuhls
2024-08-05 20:42 ` Thomas Petazzoni via buildroot
@ 2024-09-03 19:00 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2024-09-03 19:00 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Mahyar Koshkouei, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> Rebased patch 0003.
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Committed to 2024.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-03 19:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-05 17:19 [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 6.1.2 Bernd Kuhls
2024-08-05 20:41 ` Thomas Petazzoni via buildroot
-- strict thread matches above, loose matches on Subject: below --
2024-08-05 19:08 Bernd Kuhls
2024-08-05 20:42 ` Thomas Petazzoni via buildroot
2024-09-03 19:00 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox