1 |
commit: f1da9f2209af9f8b1f09f139a1f1491a5baba851 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 26 01:41:54 2019 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 26 01:41:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1da9f22 |
7 |
|
8 |
media-libs/allegro: Stable -r2 for bug 670781 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/670781 |
11 |
Package-Manager: Portage-2.3.57, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
13 |
|
14 |
media-libs/allegro/allegro-4.4.2-r1.ebuild | 111 ----------------------------- |
15 |
media-libs/allegro/allegro-4.4.2-r2.ebuild | 2 +- |
16 |
2 files changed, 1 insertion(+), 112 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild |
19 |
deleted file mode 100644 |
20 |
index 06ed3de8d26..00000000000 |
21 |
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,111 +0,0 @@ |
24 |
-# Copyright 1999-2018 Gentoo Foundation |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
- |
27 |
-EAPI=6 |
28 |
- |
29 |
-CMAKE_IN_SOURCE_BUILD=1 |
30 |
-inherit cmake-utils desktop |
31 |
- |
32 |
-DESCRIPTION="cross-platform multimedia library" |
33 |
-HOMEPAGE="https://liballeg.org/" |
34 |
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz" |
35 |
- |
36 |
-LICENSE="Allegro MIT GPL-2+ ZLIB" |
37 |
-SLOT="0" |
38 |
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86" |
39 |
-IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X" |
40 |
- |
41 |
-RDEPEND=" |
42 |
- alsa? ( media-libs/alsa-lib ) |
43 |
- jack? ( media-sound/jack-audio-connection-kit ) |
44 |
- jpeg? ( virtual/jpeg:0 ) |
45 |
- png? ( media-libs/libpng:0= ) |
46 |
- svga? ( media-libs/svgalib ) |
47 |
- vorbis? ( media-libs/libvorbis ) |
48 |
- X? ( |
49 |
- x11-libs/libX11 |
50 |
- x11-libs/libXcursor |
51 |
- x11-libs/libXext |
52 |
- x11-libs/libXpm |
53 |
- x11-libs/libXt |
54 |
- x11-libs/libXxf86dga |
55 |
- x11-libs/libXxf86vm |
56 |
- opengl? ( |
57 |
- virtual/glu |
58 |
- virtual/opengl |
59 |
- ) |
60 |
- )" |
61 |
-DEPEND="${RDEPEND} |
62 |
- virtual/pkgconfig |
63 |
- X? ( x11-base/xorg-proto )" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}"/${P}-shared.patch |
67 |
- "${FILESDIR}"/${P}-underlink.patch |
68 |
- "${FILESDIR}"/${P}-gentoo.patch |
69 |
- "${FILESDIR}"/${P}-rpath.patch |
70 |
- "${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470 |
71 |
-) |
72 |
- |
73 |
-src_prepare() { |
74 |
- cmake-utils_src_prepare |
75 |
- |
76 |
- sed -i \ |
77 |
- -e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \ |
78 |
- docs/CMakeLists.txt || die |
79 |
-} |
80 |
- |
81 |
-src_configure() { |
82 |
- # WANT_LINUX_CONSOLE is by default OFF |
83 |
- # WANT_EXAMPLES doesn't install anything |
84 |
- local mycmakeargs=( |
85 |
- -DDOCDIR=share/doc |
86 |
- -DINFODIR=share/info |
87 |
- -DMANDIR=share/man |
88 |
- -DWANT_ALSA=$(usex alsa) |
89 |
- -DWANT_EXAMPLES=OFF |
90 |
- -DWANT_JACK=$(usex jack) |
91 |
- -DWANT_JPGALLEG=$(usex jpeg) |
92 |
- -DWANT_LINUX_CONSOLE=OFF |
93 |
- -DWANT_LINUX_FBCON=$(usex fbcon) |
94 |
- -DWANT_LINUX_SVGALIB=$(usex svga) |
95 |
- -DWANT_LINUX_VGA=$(usex vga) |
96 |
- -DWANT_LOADPNG=$(usex png) |
97 |
- -DWANT_LOGG=$(usex vorbis) |
98 |
- -DWANT_OSS=$(usex oss) |
99 |
- -DWANT_TESTS=$(usex test) |
100 |
- -DWANT_TOOLS=$(usex X) |
101 |
- -DWANT_X11=$(usex X) |
102 |
- ) |
103 |
- |
104 |
- if use X; then |
105 |
- mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) ) |
106 |
- else |
107 |
- mycmakeargs+=( -DWANT_ALLEGROGL=OFF ) |
108 |
- fi |
109 |
- |
110 |
- cmake-utils_src_configure |
111 |
-} |
112 |
- |
113 |
-src_install() { |
114 |
- rm -r docs/html/{build,tmpfile.txt} || die |
115 |
- local HTML_DOCS=( docs/html/. ) |
116 |
- |
117 |
- cmake-utils_src_install |
118 |
- |
119 |
- #176020 (init_dialog.3), #409305 (key.3) |
120 |
- pushd docs/man >/dev/null |
121 |
- local manpage |
122 |
- for manpage in $(ls -d *.3); do |
123 |
- newman ${manpage} ${PN}-${manpage} |
124 |
- done |
125 |
- popd >/dev/null |
126 |
- |
127 |
- if use X; then |
128 |
- newbin setup/setup ${PN}-setup |
129 |
- insinto /usr/share/${PN} |
130 |
- doins {keyboard,language,setup/setup}.dat |
131 |
- newicon misc/icon.png ${PN}.png |
132 |
- make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings" |
133 |
- fi |
134 |
-} |
135 |
|
136 |
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild |
137 |
index 19cd6bed639..5797f5829b3 100644 |
138 |
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild |
139 |
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild |
140 |
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz" |
141 |
|
142 |
LICENSE="Allegro MIT GPL-2+ ZLIB" |
143 |
SLOT="0" |
144 |
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86" |
145 |
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86" |
146 |
IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X" |
147 |
|
148 |
RDEPEND=" |