hasufell    14/04/18 16:22:53

  Modified:             ChangeLog
  Added:                libsdl-1.2.15-r5.ebuild
  Log:
  add multilib support wrt #489122
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
BDEED020)

Revision  Changes    Path
1.213                media-libs/libsdl/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?rev=1.213&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?rev=1.213&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?r1=1.212&r2=1.213

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- ChangeLog   15 Jan 2014 09:20:41 -0000      1.212
+++ ChangeLog   18 Apr 2014 16:22:53 -0000      1.213
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.212 
2014/01/15 09:20:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.213 
2014/04/18 16:22:53 hasufell Exp $
+
+*libsdl-1.2.15-r5 (18 Apr 2014)
+
+  18 Apr 2014; Julian Ospald <[email protected]> +libsdl-1.2.15-r5.ebuild:
+  add multilib support wrt #489122
 
   15 Jan 2014; Agostino Sarubbo <[email protected]> libsdl-1.2.15-r4.ebuild:
   Stable for ia64, wrt bug #485316



1.1                  media-libs/libsdl/libsdl-1.2.15-r5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r5.ebuild?rev=1.1&content-type=text/plain

Index: libsdl-1.2.15-r5.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r5.ebuild,v 
1.1 2014/04/18 16:22:53 hasufell Exp $

# TODO: convert media-libs/libggi to multilib

EAPI=5
inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal

DESCRIPTION="Simple Direct Media Layer"
HOMEPAGE="http://www.libsdl.org/";
SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz";

LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
# WARNING:
# If you turn on the custom-cflags use flag in USE and something breaks,
# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
IUSE="oss alsa nas X dga xv xinerama fbcon ggi svga tslib aalib opengl libcaca 
+audio +video +joystick custom-cflags pulseaudio ps3 static-libs"

RDEPEND="
        abi_x86_32? (
                !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
                !<=app-emulation/emul-linux-x86-sdl-20140406
        )
        audio? ( >=media-libs/audiofile-0.1.9[${MULTILIB_USEDEP}] )
        alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
        nas? (
                media-libs/nas[${MULTILIB_USEDEP}]
                x11-libs/libXt[${MULTILIB_USEDEP}]
                x11-libs/libXext[${MULTILIB_USEDEP}]
                x11-libs/libX11[${MULTILIB_USEDEP}]
        )
        X? (
                x11-libs/libXt[${MULTILIB_USEDEP}]
                x11-libs/libXext[${MULTILIB_USEDEP}]
                x11-libs/libX11[${MULTILIB_USEDEP}]
                x11-libs/libXrandr[${MULTILIB_USEDEP}]
        )
        ggi? ( >=media-libs/libggi-2.0_beta3 )
        svga? ( >=media-libs/svgalib-1.4.2 )
        aalib? ( media-libs/aalib[${MULTILIB_USEDEP}] )
        libcaca? ( >=media-libs/libcaca-0.9-r1[${MULTILIB_USEDEP}] )
        opengl? (
                virtual/opengl[${MULTILIB_USEDEP}]
                virtual/glu[${MULTILIB_USEDEP}]
        )
        ppc64? ( ps3? ( sys-libs/libspe2 ) )
        tslib? ( x11-libs/tslib[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
        nas? (
                x11-proto/xextproto[${MULTILIB_USEDEP}]
                x11-proto/xproto[${MULTILIB_USEDEP}]
        )
        X? (
                x11-proto/xextproto[${MULTILIB_USEDEP}]
                x11-proto/xproto[${MULTILIB_USEDEP}]
        )
        x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"

S=${WORKDIR}/SDL-${PV}

MULTILIB_WRAPPED_HEADERS=(
        /usr/include/SDL/SDL_byteorder.h
        /usr/include/SDL/SDL_config.h
        /usr/include/SDL/SDL_endian.h
        /usr/include/SDL/SDL_getenv.h
        /usr/include/SDL/SDL_keysym.h
        /usr/include/SDL/SDL_syswm.h
        /usr/include/SDL/SDL_types.h
)

pkg_setup() {
        if use custom-cflags ; then
                ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
                ewarn "don't bother filing libsdl-related bugs until trying to 
remerge"
                ewarn "libsdl without the custom-cflags use flag in USE."
        fi
}

src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-sdl-config.patch \
                "${FILESDIR}"/${P}-resizing.patch \
                "${FILESDIR}"/${P}-joystick.patch \
                "${FILESDIR}"/${P}-gamma.patch \
                "${FILESDIR}"/${P}-const-xdata32.patch
        AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
}

multilib_src_configure() {
        local myconf=
        if [[ $(tc-arch) != "x86" ]] ; then
                myconf="${myconf} --disable-nasm"
        else
                myconf="${myconf} --enable-nasm"
        fi
        use custom-cflags || strip-flags
        use audio || myconf="${myconf} --disable-audio"
        use video \
                && myconf="${myconf} --enable-video-dummy" \
                || myconf="${myconf} --disable-video"
        use joystick || myconf="${myconf} --disable-joystick"

        ECONF_SOURCE="${S}" econf \
                --disable-rpath \
                --disable-arts \
                --disable-esd \
                --enable-events \
                --enable-cdrom \
                --enable-threads \
                --enable-timers \
                --enable-file \
                --enable-cpuinfo \
                --disable-alsa-shared \
                --disable-esd-shared \
                --disable-pulseaudio-shared \
                --disable-arts-shared \
                --disable-nas-shared \
                --disable-osmesa-shared \
                $(use_enable oss) \
                $(use_enable alsa) \
                $(use_enable pulseaudio) \
                $(use_enable nas) \
                $(use_enable X video-x11) \
                $(use_enable dga) \
                $(use_enable xv video-x11-xv) \
                $(use_enable xinerama video-x11-xinerama) \
                $(use_enable X video-x11-xrandr) \
                $(use_enable dga video-dga) \
                $(use_enable fbcon video-fbcon) \
                $(multilib_is_native_abi && use_enable ggi video-ggi || echo 
"--disable-video-ggi") \
                $(multilib_is_native_abi && use_enable svga video-svga || echo 
"--disable-video-svga") \
                $(use_enable aalib video-aalib) \
                $(use_enable libcaca video-caca) \
                $(use_enable opengl video-opengl) \
                $(multilib_is_native_abi && use_enable ps3 video-ps3 || echo 
"--disable-video-ps3") \
                $(use_enable tslib input-tslib) \
                $(use_with X x) \
                $(use_enable static-libs static) \
                --disable-video-x11-xme \
                --disable-video-directfb \
                ${myconf}
}

multilib_src_install() {
        emake DESTDIR="${D}" install
}

multilib_src_install_all() {
        use static-libs || prune_libtool_files --all
        dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
        dohtml -r ./
}




Reply via email to