| 1 |
hasufell 14/06/30 20:27:40 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: libsdl-1.2.15-r7.ebuild |
| 5 |
Log: |
| 6 |
fix various multilib failures wrt #514486 |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.220 media-libs/libsdl/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?rev=1.220&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?rev=1.220&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?r1=1.219&r2=1.220 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v |
| 20 |
retrieving revision 1.219 |
| 21 |
retrieving revision 1.220 |
| 22 |
diff -u -r1.219 -r1.220 |
| 23 |
--- ChangeLog 25 Jun 2014 11:03:07 -0000 1.219 |
| 24 |
+++ ChangeLog 30 Jun 2014 20:27:40 -0000 1.220 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for media-libs/libsdl |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.219 2014/06/25 11:03:07 chithanh Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.220 2014/06/30 20:27:40 hasufell Exp $ |
| 30 |
+ |
| 31 |
+*libsdl-1.2.15-r7 (30 Jun 2014) |
| 32 |
+ |
| 33 |
+ 30 Jun 2014; Julian Ospald <hasufell@g.o> +libsdl-1.2.15-r7.ebuild, |
| 34 |
+ +files/libsdl-1.2.15-caca.patch: |
| 35 |
+ fix various multilib failures wrt #514486 |
| 36 |
|
| 37 |
25 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@g.o> |
| 38 |
-files/libsdl-1.2.13-sdl-config.patch, -files/libsdl-1.2.14-click.patch, |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 media-libs/libsdl/libsdl-1.2.15-r7.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r7.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r7.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: libsdl-1.2.15-r7.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2014 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r7.ebuild,v 1.1 2014/06/30 20:27:40 hasufell Exp $ |
| 52 |
|
| 53 |
EAPI=5 |
| 54 |
inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal |
| 55 |
|
| 56 |
DESCRIPTION="Simple Direct Media Layer" |
| 57 |
HOMEPAGE="http://www.libsdl.org/" |
| 58 |
SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" |
| 59 |
|
| 60 |
LICENSE="LGPL-2.1" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 63 |
# WARNING: |
| 64 |
# If you turn on the custom-cflags use flag in USE and something breaks, |
| 65 |
# you pick up the pieces. Be prepared for bug reports to be marked INVALID. |
| 66 |
IUSE="oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs" |
| 67 |
|
| 68 |
RDEPEND=" |
| 69 |
abi_x86_32? ( |
| 70 |
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] |
| 71 |
!<=app-emulation/emul-linux-x86-sdl-20140406 |
| 72 |
) |
| 73 |
sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] ) |
| 74 |
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) |
| 75 |
nas? ( |
| 76 |
>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] |
| 77 |
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
| 78 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 79 |
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 80 |
) |
| 81 |
X? ( |
| 82 |
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
| 83 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 84 |
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 85 |
>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] |
| 86 |
) |
| 87 |
aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] ) |
| 88 |
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) |
| 89 |
opengl? ( |
| 90 |
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
| 91 |
>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] |
| 92 |
) |
| 93 |
tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) |
| 94 |
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )" |
| 95 |
DEPEND="${RDEPEND} |
| 96 |
nas? ( |
| 97 |
>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
| 98 |
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] |
| 99 |
) |
| 100 |
X? ( |
| 101 |
>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
| 102 |
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] |
| 103 |
) |
| 104 |
x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" |
| 105 |
|
| 106 |
S=${WORKDIR}/SDL-${PV} |
| 107 |
|
| 108 |
pkg_setup() { |
| 109 |
if use custom-cflags ; then |
| 110 |
ewarn "Since you've chosen to use possibly unsafe CFLAGS," |
| 111 |
ewarn "don't bother filing libsdl-related bugs until trying to remerge" |
| 112 |
ewarn "libsdl without the custom-cflags use flag in USE." |
| 113 |
fi |
| 114 |
} |
| 115 |
|
| 116 |
src_prepare() { |
| 117 |
epatch \ |
| 118 |
"${FILESDIR}"/${P}-sdl-config.patch \ |
| 119 |
"${FILESDIR}"/${P}-resizing.patch \ |
| 120 |
"${FILESDIR}"/${P}-joystick.patch \ |
| 121 |
"${FILESDIR}"/${P}-gamma.patch \ |
| 122 |
"${FILESDIR}"/${P}-const-xdata32.patch \ |
| 123 |
"${FILESDIR}"/${P}-caca.patch |
| 124 |
AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf |
| 125 |
} |
| 126 |
|
| 127 |
multilib_src_configure() { |
| 128 |
local myconf= |
| 129 |
if use !x86 ; then |
| 130 |
myconf="${myconf} --disable-nasm" |
| 131 |
else |
| 132 |
myconf="${myconf} --enable-nasm" |
| 133 |
fi |
| 134 |
use custom-cflags || strip-flags |
| 135 |
use sound || myconf="${myconf} --disable-audio" |
| 136 |
use video \ |
| 137 |
&& myconf="${myconf} --enable-video-dummy" \ |
| 138 |
|| myconf="${myconf} --disable-video" |
| 139 |
use joystick || myconf="${myconf} --disable-joystick" |
| 140 |
|
| 141 |
ECONF_SOURCE="${S}" econf \ |
| 142 |
--disable-rpath \ |
| 143 |
--disable-arts \ |
| 144 |
--disable-esd \ |
| 145 |
--enable-events \ |
| 146 |
--enable-cdrom \ |
| 147 |
--enable-threads \ |
| 148 |
--enable-timers \ |
| 149 |
--enable-file \ |
| 150 |
--enable-cpuinfo \ |
| 151 |
--disable-alsa-shared \ |
| 152 |
--disable-esd-shared \ |
| 153 |
--disable-pulseaudio-shared \ |
| 154 |
--disable-arts-shared \ |
| 155 |
--disable-nas-shared \ |
| 156 |
--disable-osmesa-shared \ |
| 157 |
$(use_enable oss) \ |
| 158 |
$(use_enable alsa) \ |
| 159 |
$(use_enable pulseaudio) \ |
| 160 |
$(use_enable nas) \ |
| 161 |
$(use_enable X video-x11) \ |
| 162 |
$(use_enable dga) \ |
| 163 |
$(use_enable xv video-x11-xv) \ |
| 164 |
$(use_enable xinerama video-x11-xinerama) \ |
| 165 |
$(use_enable X video-x11-xrandr) \ |
| 166 |
$(use_enable dga video-dga) \ |
| 167 |
$(use_enable fbcon video-fbcon) \ |
| 168 |
--disable-video-ggi \ |
| 169 |
--disable-video-svga \ |
| 170 |
$(use_enable aalib video-aalib) \ |
| 171 |
$(use_enable libcaca video-caca) \ |
| 172 |
$(use_enable opengl video-opengl) \ |
| 173 |
--disable-video-ps3 \ |
| 174 |
$(use_enable tslib input-tslib) \ |
| 175 |
$(use_with X x) \ |
| 176 |
$(use_enable static-libs static) \ |
| 177 |
--disable-video-x11-xme \ |
| 178 |
--disable-video-directfb \ |
| 179 |
${myconf} |
| 180 |
} |
| 181 |
|
| 182 |
multilib_src_install() { |
| 183 |
emake DESTDIR="${D}" install |
| 184 |
} |
| 185 |
|
| 186 |
multilib_src_install_all() { |
| 187 |
use static-libs || prune_libtool_files --all |
| 188 |
dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew |
| 189 |
dohtml -r ./ |
| 190 |
} |
Archives