diff options
| -rw-r--r-- | media-libs/libsdl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.9-DirectFB-updates.patch | 26 | ||||
| -rw-r--r-- | media-libs/libsdl/libsdl-1.2.9-r1.ebuild | 5 |
3 files changed, 34 insertions, 3 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 7381725eadb8..32cf6c08eaaa 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.91 2005/10/05 00:34:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.92 2005/10/28 01:22:35 vapier Exp $ + + 28 Oct 2005; Mike Frysinger <vapier@gentoo.org> + +files/libsdl-1.2.9-DirectFB-updates.patch, libsdl-1.2.9-r1.ebuild: + Fix building with newer DirectFB. 05 Oct 2005; Mike Frysinger <vapier@gentoo.org> libsdl-1.2.6-r3.ebuild, libsdl-1.2.7-r3.ebuild, libsdl-1.2.8-r1.ebuild, libsdl-1.2.9.ebuild, diff --git a/media-libs/libsdl/files/libsdl-1.2.9-DirectFB-updates.patch b/media-libs/libsdl/files/libsdl-1.2.9-DirectFB-updates.patch new file mode 100644 index 000000000000..ade4540450f2 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.9-DirectFB-updates.patch @@ -0,0 +1,26 @@ +--- src/video/directfb/SDL_DirectFB_video.c ++++ src/video/directfb/SDL_DirectFB_video.c +@@ -376,7 +376,11 @@ int DirectFB_VideoInit(_THIS, SDL_PixelF + { + int i; + DFBResult ret; ++#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23) + DFBCardCapabilities caps; ++#else ++ DFBGraphicsDeviceDescription caps; ++#endif + DFBDisplayLayerConfig dlc; + struct DirectFBEnumRect *rect; + IDirectFB *dfb = NULL; +@@ -448,7 +452,11 @@ int DirectFB_VideoInit(_THIS, SDL_PixelF + + + /* Query card capabilities to get the video memory size */ ++#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23) + dfb->GetCardCapabilities (dfb, &caps); ++#else ++ dfb->GetDeviceDescription (dfb, &caps); ++#endif + + this->info.wm_available = 1; + this->info.hw_available = 1; diff --git a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild index 0bcb5d9d25e9..d5547ccd355a 100644 --- a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild +++ b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.3 2005/10/05 00:34:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.4 2005/10/28 01:22:35 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils @@ -66,8 +66,9 @@ src_unpack() { epatch "${FILESDIR}"/libsdl-1.2.9-PIC-SDL_stretch.patch epatch "${FILESDIR}"/libsdl-1.2.9-PIC-hermes-call-dont-jump.patch epatch "${FILESDIR}"/libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch - epatch "${FILESDIR}"/libsdl-1.2.9-PIC-yuv-mmx.patch + [[ $(gcc-major-version) != "2" ]] && epatch "${FILESDIR}"/libsdl-1.2.9-PIC-yuv-mmx.patch epatch "${FILESDIR}"/${P}-sdl-blit-mmx-check.patch #104533 + epatch "${FILESDIR}"/${P}-DirectFB-updates.patch ./autogen.sh || die "autogen failed" epunt_cxx |