* [gentoo-commits] repo/gentoo:master commit in: media-libs/aalib/, media-libs/aalib/files/
@ 2016-12-23 19:21 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2016-12-23 19:21 UTC (permalink / raw
To: gentoo-commits
commit: e7b23d8f7f6b6d140360fe27f7a388b5e61e138a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 19:20:03 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 19:20:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b23d8f
media-libs/aalib: add epatch_user, fix implicit function declarations on gcc-6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/aalib/aalib-1.4_rc5-r8.ebuild | 71 ++++++++++++++++++++++
...-OOB.patch => aalib-1.4_rc5-key-down-OOB.patch} | 0
.../aalib/files/aalib-1.4_rc5-more-protos.patch | 55 +++++++++++++++++
3 files changed, 126 insertions(+)
diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
new file mode 100644
index 00000000..bfc4f24
--- /dev/null
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-multilib eutils toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${PN}-1.4.0"
+
+DESCRIPTION="A ASCII-Graphics Library"
+HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="X slang gpm static-libs"
+
+RDEPEND="
+ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+ gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] )
+ slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
+ >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? ( x11-proto/xproto )
+"
+
+DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
+ epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-key-down-OOB.patch
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-more-protos.patch
+
+ sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
+
+ # Fix bug #165617.
+ use gpm || sed -i \
+ 's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
+
+ #467988 automake-1.13
+ mv configure.{in,ac} || die
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with slang slang-driver)
+ $(use_with X x11-driver)
+ $(use_enable static-libs static)
+ )
+
+ PKG_CONFIG=$(tc-getPKG_CONFIG) \
+ autotools-multilib_src_configure
+}
+
+src_install() {
+ autotools-multilib_src_install
+ use static-libs || prune_libtool_files --all
+}
diff --git a/media-libs/aalib/files/aalib-1.4_rc6-key-down-OOB.patch b/media-libs/aalib/files/aalib-1.4_rc5-key-down-OOB.patch
similarity index 100%
rename from media-libs/aalib/files/aalib-1.4_rc6-key-down-OOB.patch
rename to media-libs/aalib/files/aalib-1.4_rc5-key-down-OOB.patch
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-more-protos.patch b/media-libs/aalib/files/aalib-1.4_rc5-more-protos.patch
new file mode 100644
index 00000000..58d37f1
--- /dev/null
+++ b/media-libs/aalib/files/aalib-1.4_rc5-more-protos.patch
@@ -0,0 +1,55 @@
+diff --git a/src/aakbdreg.c b/src/aakbdreg.c
+index f4f8efb..b344dd8 100644
+--- a/src/aakbdreg.c
++++ b/src/aakbdreg.c
+@@ -1,2 +1,3 @@
+ #include <stdlib.h>
++#include <string.h> /* strcmp */
+ #include "config.h"
+diff --git a/src/aalinuxkbd.c b/src/aalinuxkbd.c
+index a5379bb..e816eb2 100644
+--- a/src/aalinuxkbd.c
++++ b/src/aalinuxkbd.c
+@@ -10,2 +10,3 @@
+ #include "config.h"
++#include <stdlib.h> /* atexit */
+ #ifdef LINUX_DRIVER
+@@ -135,3 +136,3 @@ static int get_keyb_map(void)
+
+- if (ioctl(tty_fd, KDGKBENT, (unsigned int) &keyb_ent))
++ if (ioctl(tty_fd, KDGKBENT, &keyb_ent))
+ return (0);
+@@ -144,3 +145,3 @@ static int get_keyb_map(void)
+
+- if (ioctl(tty_fd, KDGKBENT, (unsigned int) &keyb_ent))
++ if (ioctl(tty_fd, KDGKBENT, &keyb_ent))
+ return (0);
+@@ -200,3 +201,3 @@ static int rawmode_init(void)
+ if (!closed)
+- return;
++ return (1);
+ mypid = getpid();
+diff --git a/src/aamoureg.c b/src/aamoureg.c
+index bb55fe3..4a533b6 100644
+--- a/src/aamoureg.c
++++ b/src/aamoureg.c
+@@ -1,2 +1,3 @@
+ #include <stdlib.h>
++#include <string.h> /* strcmp */
+ #include "config.h"
+diff --git a/src/aaregist.c b/src/aaregist.c
+index 765155e..f9190ab 100644
+--- a/src/aaregist.c
++++ b/src/aaregist.c
+@@ -1,2 +1,3 @@
+ #include <stdlib.h>
++#include <string.h> /* strcmp */
+ #include "config.h"
+diff --git a/src/aaxkbd.c b/src/aaxkbd.c
+index dacc80f..c252cd9 100644
+--- a/src/aaxkbd.c
++++ b/src/aaxkbd.c
+@@ -7,2 +7,3 @@
+ #include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <X11/keysymdef.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/aalib/, media-libs/aalib/files/
@ 2019-11-10 11:32 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2019-11-10 11:32 UTC (permalink / raw
To: gentoo-commits
commit: eed715a0df51ce557edd332605fc1bde9509621c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 11:27:35 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 11:32:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed715a0
media-libs/aalib: refresh up to EAPI=7
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
media-libs/aalib/aalib-1.4_rc5-r9.ebuild | 73 ++++++++++++++++++++++
.../aalib/files/aalib-1.4_rc5-fix-aarender.patch | 4 +-
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
new file mode 100644
index 00000000000..750d19857c6
--- /dev/null
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${PN}-1.4.0"
+
+DESCRIPTION="A ASCII-Graphics Library"
+HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="X slang gpm static-libs"
+
+RDEPEND="
+ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+ gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] )
+ slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
+ >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )
+"
+
+DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
+ "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
+ "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
+ "${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
+ "${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+ "${FILESDIR}"/${PN}-1.4_rc5-key-down-OOB.patch
+ "${FILESDIR}"/${PN}-1.4_rc5-more-protos.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
+
+ # Fix bug #165617.
+ use gpm || sed -i \
+ 's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
+
+ #467988 automake-1.13
+ mv configure.{in,ac} || die
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} econf \
+ $(use_with slang slang-driver) \
+ $(use_with X x11-driver) \
+ $(use_enable static-libs static) \
+ PKG_CONFIG=$(tc-getPKG_CONFIG)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if ! use static-libs; then
+ find "${D}" -name '*.la' -type f -delete || die
+ fi
+}
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch b/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch
index 97c59836b5c..2c3d5bf437f 100644
--- a/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch
+++ b/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch
@@ -19,8 +19,8 @@ image, not cause part of it to miss.
Gentoo-bug: http://bugs.gentoo.org/id=214142
Reported-by: Reimar Döffinger
Fixed-by: Reimar Döffinger
---- src/aarender.c.orig 2008-03-18 23:55:32.000000000 +0100
-+++ src/aarender.c 2008-03-18 23:55:50.000000000 +0100
+--- a/src/aarender.c.orig 2008-03-18 23:55:32.000000000 +0100
++++ b/src/aarender.c 2008-03-18 23:55:50.000000000 +0100
@@ -94,8 +94,8 @@
gamma = randomval / 2;
mval = (c->parameters[c->filltable[255]].p[4]);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-10 11:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-10 11:32 [gentoo-commits] repo/gentoo:master commit in: media-libs/aalib/, media-libs/aalib/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2016-12-23 19:21 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox