* [gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/, media-libs/svgalib/files/
@ 2016-02-22 9:03 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2016-02-22 9:03 UTC (permalink / raw
To: gentoo-commits
commit: d015d86919746aadcf0fb86d02548936f3f8e900
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 09:00:43 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 09:02:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d015d869
media-libs/svgalib: fix bug 557052
Add support for file_inode() appeared in 3.9.0.
In 4.0 f_dentry struct was removed, so this call is the only way
to go.
Patch is based on Diego Moimas proposal from bug 557052.
Package-Manager: portage-2.2.27
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
.../svgalib/files/svgalib-1.9.25-linux3.9.patch | 27 ++++++++++++++++++++++
media-libs/svgalib/svgalib-1.9.25-r4.ebuild | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux3.9.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux3.9.patch
new file mode 100644
index 0000000..be10e39
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux3.9.patch
@@ -0,0 +1,27 @@
+--- svgalib-1.9.25/kernel/svgalib_helper/main.c.orig 2016-02-22 11:10:25.000000000 +0300
++++ svgalib-1.9.25/kernel/svgalib_helper/main.c 2016-02-22 11:17:16.223529679 +0300
+@@ -170,8 +170,12 @@
+ #else
+ static int svgalib_helper_ioctl(struct file *filp,
+ unsigned int cmd, unsigned long arg) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
++ struct inode *inode=file_inode(filp);
++#else
+ struct inode *inode=filp->f_dentry->d_inode;
+ #endif
++#endif
+
+ io_t iov, *user_iov=(io_t *)arg;
+ pcic_t pciv, *user_pciv=(pcic_t *)arg;
+@@ -586,7 +590,11 @@
+ static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) {
+ unsigned long start=vma->vm_start;
+ unsigned long end=vma->vm_end;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
++ unsigned long minor = my_minor(file_inode(filp)->i_rdev);
++#else
+ unsigned long minor = my_minor(filp->f_dentry->d_inode->i_rdev);
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+ unsigned long ofs=vma->vm_pgoff*PAGE_SIZE;
+ #else
diff --git a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
index 2f7f0b8..b68e30f 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,6 +37,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.9.25-build2.patch
epatch "${FILESDIR}"/${PN}-1.9.25-qa.patch
epatch "${FILESDIR}"/${PN}-1.9.25-kernel3.4.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-linux3.9.patch
sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/, media-libs/svgalib/files/
@ 2016-02-22 12:08 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2016-02-22 12:08 UTC (permalink / raw
To: gentoo-commits
commit: 99ca2ad8839ddd8ef75d7ed5394b5372c322c168
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 09:30:01 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 12:08:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ca2ad8
media-libs/svgalib: rename patches to more sane and consistent names
Package-Manager: portage-2.2.27
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
...25-segfault.patch => svgalib-1.9.25-fix_buffer.patch} | 0
...nux2.6.28.patch => svgalib-1.9.25-linux_2.6.28.patch} | 0
....36-r1.patch => svgalib-1.9.25-linux_2.6.36-r1.patch} | 0
....25-linux2.6.patch => svgalib-1.9.25-linux_2.6.patch} | 0
...25-kernel3.4.patch => svgalib-1.9.25-linux_3.4.patch} | 0
....25-linux3.9.patch => svgalib-1.9.25-linux_3.9.patch} | 0
....25-qa.patch => svgalib-1.9.25-missing_include.patch} | 0
....9.25-build2.patch => svgalib-1.9.25-vga_reset.patch} | 0
media-libs/svgalib/svgalib-1.9.25-r4.ebuild | 16 ++++++++--------
9 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-segfault.patch b/media-libs/svgalib/files/svgalib-1.9.25-fix_buffer.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-segfault.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-fix_buffer.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.28.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.28.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux2.6.28.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.28.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36-r1.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36-r1.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux3.9.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux3.9.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-qa.patch b/media-libs/svgalib/files/svgalib-1.9.25-missing_include.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-qa.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-missing_include.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-build2.patch b/media-libs/svgalib/files/svgalib-1.9.25-vga_reset.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-build2.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-vga_reset.patch
diff --git a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
index b68e30f..0f64c9a 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
@@ -27,17 +27,17 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
- epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.36-r1.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-segfault.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-build2.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-qa.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-kernel3.4.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-linux3.9.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-missing_include.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
+ epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch #557052
sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/, media-libs/svgalib/files/
@ 2021-04-21 13:03 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2021-04-21 13:03 UTC (permalink / raw
To: gentoo-commits
commit: d30a7db82744709b7ad01828b15e4787318848aa
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 13:00:13 2021 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 13:02:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30a7db8
media-libs/svgalib: use $AR if set
Closes: https://bugs.gentoo.org/724714
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
media-libs/svgalib/files/svgalib-1.9.25-ar.patch | 12 ++++++++++++
media-libs/svgalib/svgalib-1.9.25-r8.ebuild | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-ar.patch b/media-libs/svgalib/files/svgalib-1.9.25-ar.patch
new file mode 100644
index 00000000000..1f48481f781
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-ar.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/724714
+--- svgalib-1.9.25/Makefile.cfg.orig 2021-04-21 15:27:13.000000000 +0300
++++ svgalib-1.9.25/Makefile.cfg 2021-04-21 15:47:57.152922480 +0300
+@@ -318,7 +318,7 @@
+ DLLFLAGS = -fPIC -DPIC
+
+ # Utilites used.
+-AR = ar
++AR ?= ar
+ INSTALL_PROGRAM = install -m755
+ INSTALL_SCRIPT = install -m755
+ INSTALL_SHLIB = install -m755
diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 55f0bb10dda..87dea240053 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
"${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
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-21 13:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-21 13:03 [gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/, media-libs/svgalib/files/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2016-02-22 12:08 Andrew Savchenko
2016-02-22 9:03 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox