--- dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild +++ dev-libs/DirectFB/DirectFB-1.7.1.ebuild @@ -32,25 +32,41 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86" -IUSE="bmp debug dynload doc fbcon gif gles2 imlib2 input_hub jpeg jpeg2k mmx mng mpeg2 multicore opengl png pnm sdl sse static-libs svg truetype v4l vdpau X zlib ${IUV} ${IUD}" +IUSE="alsa bmp cddb debug divine drmkms dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl sse static-libs svg swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib ${IUV} ${IUD}" REQUIRED_USE="gles2? ( opengl )" -# gstreamer useflag broken -# gstreamer? ( media-libs/FusionSound media-libs/gst-plugins-base:0.10 ) -# $(use_enable gstreamer) \ +# ffmpeg useflag broken +# ffmpeg? ( virtual/ffmpeg ) +# $(use_enable ffmpeg) \ RDEPEND=" + alsa? ( media-libs/alsa-lib ) + cddb? ( media-libs/libcddb ) + drmkms? ( x11-libs/libdrm[libkms] ) gif? ( media-libs/giflib ) + gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) imlib2? ( media-libs/imlib2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper[jpeg] ) + mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) - opengl? ( media-libs/mesa[gbm,egl,gles2?] x11-libs/libdrm ) + mpeg3? ( media-libs/libmpeg3 ) + opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) svg? ( x11-libs/libsvg-cairo ) + swfdec? ( media-libs/swfdec ) + tiff? ( media-libs/tiff:0 ) + timidity? ( + media-libs/libtimidity + media-sound/timidity++ + ) + tremor? ( media-libs/tremor ) truetype? ( >=media-libs/freetype-2.0.1 ) vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau ) + vorbis? ( media-libs/libvorbis ) + webp? ( media-libs/libwebp ) X? ( x11-libs/libXext x11-libs/libX11 ) + xine? ( media-libs/xine-lib[vdpau?] ) zlib? ( sys-libs/zlib ) " DEPEND="${RDEPEND} X? ( x11-proto/xextproto x11-proto/xproto )" @@ -58,10 +74,10 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-flags.patch \ - "${FILESDIR}"/${P}-pkgconfig.patch \ + "${FILESDIR}"/${PN}-1.6.3-pkgconfig.patch \ "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-setregion.patch \ - "${FILESDIR}"/${P}-atomic-fix-compiler-error-when-building-for-thumb2.patch + "${FILESDIR}"/${PN}-1.6.3-setregion.patch \ + "${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch mv configure.{in,ac} || die eautoreconf @@ -80,6 +96,10 @@ } src_configure() { + local myaudio="wave" + use alsa && myaudio+=",alsa" + use oss && myaudio+=",oss" + local sdlconf="--disable-sdl" if use sdl ; then # since SDL can link against DirectFB and trigger a @@ -106,20 +126,36 @@ econf \ $(use_enable static-libs static) \ $(use_enable X x11) \ + $(use_enable divine) \ + $(use_enable sawman) \ + $(use_enable fusiondale) \ + $(use_enable fusionsound) \ $(use_enable fbcon fbdev) \ $(use_enable mmx) \ $(use_enable sse) \ + $(use_enable egl) \ + $(use_enable egl idirectfbgl-egl) \ $(use_enable jpeg) \ $(use_enable png) \ $(use_enable mng) \ + $(use_enable gstreamer) \ $(use_enable gif) \ + $(use_enable tiff) \ $(use_enable imlib2) \ $(use_enable pnm) \ $(use_enable svg) \ $(use_enable mpeg2) \ + $(use_enable mpeg3 libmpeg3) \ + --disable-flash \ + $(use_enable xine) \ + $(usex xine "$(use_enable vdpau xine-vdpau)" "--disable-xine-vdpau") \ + --disable-ffmpeg \ $(use_enable bmp) \ $(use_enable jpeg2k jpeg2000) \ + --disable-openquicktime \ + --disable-avifile \ $(use_enable truetype freetype) \ + $(use_enable webp) \ $(use_enable debug) \ $(use_enable zlib) \ --disable-video4linux \ @@ -128,6 +164,15 @@ $(use_enable multicore) \ $(use_enable dynload) \ $(use_enable opengl mesa) \ + $(use_enable drmkms) \ + --with-fs-drivers="${myaudio}" \ + $(use_with timidity) \ + --with-wave \ + $(use_with vorbis) \ + $(use_with tremor) \ + $(use_with mad) \ + $(use_with cddb cdda) \ + --with-playlist \ ${sdlconf} \ --with-gfxdrivers="${gfxdrivers}" \ --with-inputdrivers="${inputdrivers}" \