[gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/files/, media-libs/svgalib/

2021-05-16 Thread Andrew Savchenko 
commit: 69066bcc0d5d5f91d796bbc819e6c7b68a965cff
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 16 11:15:08 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun May 16 11:15:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69066bcc

media-libs/svgalib: fix asm arg width

rorw operates on word-width registers, specify this explicitly via %w0

Closes: https://bugs.gentoo.org/789747
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../svgalib/files/svgalib-1.9.25-gl-asm-width.patch   | 15 +++
 media-libs/svgalib/svgalib-1.9.25-r8.ebuild   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
new file mode 100644
index 000..8204ea163bd
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=789747
+--- svgalib-1.9.25/gl/driver.c.orig2021-05-16 13:24:38.937410767 +0300
 svgalib-1.9.25/gl/driver.c 2021-05-16 13:24:47.263441562 +0300
+@@ -38,9 +38,9 @@
+   ((c >> 8) & 0xff) << 8 |
+   ((c >> 16) & 0xff) << 0;
+ #else
+-  asm("rorw  $8, %0\n"/* 0RGB -> 0RBG */
++  asm("rorw  $8, %w0\n"   /* 0RGB -> 0RBG */
+   "rorl $16, %0\n"/* 0RBG -> BG0R */
+-  "rorw  $8, %0\n"/* BG0R -> BGR0 */
++  "rorw  $8, %w0\n"   /* BG0R -> BGR0 */
+   "shrl  $8, %0\n"/* 0BGR -> 0BGR */
+   : "=q"(c):"0"(c));
+ #endif

diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild 
b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 87dea240053..6d98ad4c4ef 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
"${FILESDIR}"/${PN}-1.9.25-ar.patch
+   "${FILESDIR}"/${PN}-1.9.25-gl-asm-width.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/files/, media-libs/svgalib/

2020-05-02 Thread Andrew Savchenko 
commit: 89c4396610b1a9b0652bed90102d4014b0e5b4f0
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat May  2 09:14:45 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat May  2 09:20:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c43966

media-libs/svgalib: fix build with recent kernels and more

- Fix build with recent kernels by migrating from SUBDIRS to M.
- Bump to EAPI 7.
- Disable package-side man page compression.
- Fix buffer overflow in wrapdemo.c.
- Clean up ebuild and fix spec QA issues.
- Rebase patches with fuzz.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../svgalib/files/svgalib-1.9.25-linux_2.6.patch   |   2 +-
 .../svgalib/files/svgalib-1.9.25-linux_3.4.patch   |  58 +-
 .../svgalib/files/svgalib-1.9.25-linux_3.9.patch   |  11 +-
 .../files/svgalib-1.9.25-no-man-compression.patch  |  26 +
 .../svgalib-1.9.25-wrapdemo-buf-overflow.patch |  14 +++
 media-libs/svgalib/svgalib-1.9.25-r6.ebuild| 124 +
 6 files changed, 200 insertions(+), 35 deletions(-)

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
index 20ab1fe1ed1..113a2391cdf 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
@@ -22,7 +22,7 @@
 +++ svgalib/kernel/svgalib_helper/Makefile.alt
 @@ -37,7 +37,7 @@
  CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
- 
+   

  ifeq (1,$(findstring 1,$(MODVER)))
 -  CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
 +  CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
index 5e2d1e527cb..ce9c74ccd20 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
@@ -1,29 +1,29 @@
-diff -Naur svgalib-1.9.25/kernel/svgalib_helper/main.c 
svgalib-1.9.25_new/kernel/svgalib_helper/main.c
 svgalib-1.9.25/kernel/svgalib_helper/main.c2006-01-12 
18:17:53.0 +
-+++ svgalib-1.9.25_new/kernel/svgalib_helper/main.c2012-06-25 
15:02:11.0 +0100
-@@ -33,7 +33,9 @@
- 
- #include 
- #include 
--#include/* cli(), *_flags */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
-+  #include/* cli(), *_flags */
-+#endif
- #include   /* memcpy and such */
- #include 
- #include 
-diff -Naur svgalib-1.9.25/kernel/svgalib_helper/Makefile 
svgalib-1.9.25_new/kernel/svgalib_helper/Makefile
 svgalib-1.9.25/kernel/svgalib_helper/Makefile2006-05-20 
13:31:04.0 +0100
-+++ svgalib-1.9.25_new/kernel/svgalib_helper/Makefile2012-06-25 
13:39:38.0 +0100
-@@ -11,9 +11,11 @@
-PWD:= $(shell pwd)
-TARGET  := svgalib_helper
- 
-+   ifneq ($(TOPDIR),)
-   ifeq ($(PATCHLEVEL),4)
-  include $(TOPDIR)/Rules.make
-   endif
-+   endif 
- 
- else
- 
\ No newline at end of file
+diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/Makefile 
svgalib-1.9.25/kernel/svgalib_helper/Makefile
+--- svgalib-1.9.25.prev/kernel/svgalib_helper/Makefile 2020-05-02 
09:49:05.072052128 +0300
 svgalib-1.9.25/kernel/svgalib_helper/Makefile  2020-05-02 
09:50:14.748043187 +0300
+@@ -11,9 +11,11 @@
+PWD:= $(shell pwd)
+TARGET  := svgalib_helper
+ 
++   ifneq ($(TOPDIR),)
+   ifeq ($(PATCHLEVEL),4)
+  include $(TOPDIR)/Rules.make
+   endif
++   endif 
+ 
+ else
+ 
+diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c 
svgalib-1.9.25/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c   2020-05-02 
09:49:05.075052085 +0300
 svgalib-1.9.25/kernel/svgalib_helper/main.c2020-05-02 
09:50:14.751043144 +0300
+@@ -38,7 +38,9 @@
+ 
+ #include 
+ #include 
+-#include/* cli(), *_flags */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
++  #include/* cli(), *_flags */
++#endif
+ #include   /* memcpy and such */
+ #include 
+ #include 

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
index be10e394707..2e1f87d7c6f 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
@@ -1,8 +1,9 @@
 svgalib-1.9.25/kernel/svgalib_helper/main.c.orig   2016-02-22 
11:10:25.0 +0300
-+++ svgalib-1.9.25/kernel/svgalib_helper/main.c2016-02-22 
11:17:16.223529679 +0300
-@@ -170,8 +170,12 @@
+diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c 
svgalib-1.9.25/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c   2020-05-02

[gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/files/, media-libs/svgalib/

2016-05-25 Thread Andrew Savchenko 
commit: 352186c283d9543c7a5fe809933dbd2b2d22a98f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 25 07:56:23 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 25 07:56:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=352186c2

media-libs/svgalib: fix build failures

1. Bug 576260.
App code needs C89 extern inlines. The sanes way is to use
-fgnu89-inlines.

2. Bug 583726.
Use long instead of int to avoid incompatible pointer type errors
(starting with linux-4.6.0)

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch | 2 +-
 media-libs/svgalib/svgalib-1.9.25-r5.ebuild   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
index ad8d94c..dbc0338 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
@@ -10,7 +10,7 @@
  static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, 
unsigned int cmd, unsigned long arg) {
 +#else
-+static int svgalib_helper_ioctl(struct file *filp, 
++static long svgalib_helper_ioctl(struct file *filp,
 +  unsigned int cmd, unsigned long arg) {
 +struct inode *inode=filp->f_dentry->d_inode;
 +#endif

diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild 
b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
index ca70927..c315012 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
@@ -46,6 +46,8 @@ src_compile() {
use kernel-helper || export NO_HELPER=y
 
export CC=$(tc-getCC)
+   # C89 extern inlines are needed, see #576260
+   append-cflags -fgnu89-inline
 
# First build static
emake OPTIMIZE="${CFLAGS}" static