[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-171-g4c0869ff4
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2020-03-20 17:36:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4c0869ff41ec585fe59e53a7efbf609eab054257 (commit)
from cc92dd721dec795b761bb70d49faa77bf2558dd3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4c0869ff41ec585fe59e53a7efbf609eab054257
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 20 18:35:31 2020 +0100
[BUILDROOT] 2019.02: fbgrab: backport patche to fix URL and update
-----------------------------------------------------------------------
Summary of changes:
.../028-armadeus-fbgrab-bump-to-1.3-version.patch | 6 ++-
...rab-bump-version-to-1.3.1-and-update-proj.patch | 61 ++++++++++++++++++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 3 ++
3 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch
diff --git a/patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch b/patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
index 581ca95f8..5f8b0e8f1 100644
--- a/patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
+++ b/patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
@@ -2,10 +2,12 @@ Index: buildroot/package/fbgrab/0002-fix-1.3-version.patch
===================================================================
--- /dev/null
+++ buildroot/package/fbgrab/0002-fix-1.3-version.patch
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,17 @@
+Reported to Gunnar by email.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
++Signed-off-by: Sébastien Szymanski <seb...@ar...>
++[ version update patch for version 1.3.1 ]
+
+--- fbgrab-1.3.org/fbgrab.c 2015-06-16 22:53:20.000000000 +0200
++++ fbgrab-1.3/fbgrab.c 2016-04-05 17:08:41.451533589 +0200
@@ -14,7 +16,7 @@ Index: buildroot/package/fbgrab/0002-fix-1.3-version.patch
+ #include <linux/fb.h> /* to handle framebuffer ioctls */
+
+-#define VERSION "1.2"
-++#define VERSION "1.3"
+++#define VERSION "1.3.1"
+ #define DEFAULT_FB "/dev/fb0"
+ #define MAX_LEN 512
+ #define UNDEFINED -1
diff --git a/patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch b/patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch
new file mode 100644
index 000000000..bf35c4369
--- /dev/null
+++ b/patches/buildroot/2019.02/220-package-fbgrab-bump-version-to-1.3.1-and-update-proj.patch
@@ -0,0 +1,61 @@
+From 7e87817d2c4168e857d1a2aa4cd6b21ed080a96f Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps....@gm...>
+Date: Wed, 4 Mar 2020 11:31:41 +0100
+Subject: [PATCH 1/1] package/fbgrab: bump version to 1.3.1 and update projct
+ URL
+
+- bump version to 1.3.1
+ Changelog:
+ * Incorrect alpha value when converting 32-bit framebuffers.
+ * Documentation for github instead of own homepage.
+
+- update project URL
+
+Fixes bug 12606 ([1]).
+
+[1] https://bugs.busybox.net/show_bug.cgi?id=12606
+
+Signed-off-by: Peter Seiderer <ps....@gm...>
+Tested-by: Timo Ketola <tim...@ex...>
+Acked-by: Timo Ketola <tim...@ex...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/fbgrab/Config.in | 2 +-
+ package/fbgrab/fbgrab.hash | 2 +-
+ package/fbgrab/fbgrab.mk | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: buildroot/package/fbgrab/Config.in
+===================================================================
+--- buildroot.orig/package/fbgrab/Config.in
++++ buildroot/package/fbgrab/Config.in
+@@ -5,4 +5,4 @@ config BR2_PACKAGE_FBGRAB
+ FBGrab is a framebuffer screenshot program, capturing the
+ linux frambuffer and converting it to a png-picture.
+
+- http://fbgrab.monells.se/
++ https://github.com/GunnarMonell/fbgrab
+Index: buildroot/package/fbgrab/fbgrab.hash
+===================================================================
+--- buildroot.orig/package/fbgrab/fbgrab.hash
++++ buildroot/package/fbgrab/fbgrab.hash
+@@ -1,2 +1,3 @@
+ # Locally calculated
+-sha256 5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed fbgrab-1.3.tar.gz
++sha256 3314a932f830e32feaf36914e1b43326529fe35b7eb7410ff55f16c930ddfbcb fbgrab-1.3.1.tar.gz
++sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- buildroot.orig/package/fbgrab/fbgrab.mk
++++ buildroot/package/fbgrab/fbgrab.mk
+@@ -4,8 +4,8 @@
+ #
+ ################################################################################
+
+-FBGRAB_VERSION = 1.3
+-FBGRAB_SITE = http://fbgrab.monells.se
++FBGRAB_VERSION = 1.3.1
++FBGRAB_SITE = $(call github,GunnarMonell,fbgrab,$(FBGRAB_VERSION))
+ FBGRAB_DEPENDENCIES = libpng
+ FBGRAB_LICENSE = GPL-2.0
+ FBGRAB_LICENSE_FILES = COPYING
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 3bb04be8b..c4613fb26 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -41,6 +41,9 @@ rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
+rm -rf buildroot/package/fbgrab/Config.in
+rm -rf buildroot/package/fbgrab/fbgrab.hash
+rm -rf buildroot/package/fbgrab/fbgrab.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
hooks/post-receive
--
armadeus
|