fix logic/syntax of --with-gfxdrivers and --with-inputdrivers, fix bug #456112 , fix bug #456122 , drop broken video_cards_savage, remove old

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 117 insertions, 11 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 4f228eb60d1b..742994bbf8ad 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.130 2013/02/07 20:15:45 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.131 2013/02/09 16:10:36 hasufell Exp $
+
+*DirectFB-1.6.3-r1 (09 Feb 2013)
+
+  09 Feb 2013; Julian Ospald <hasufell@gentoo.org> -DirectFB-1.6.3.ebuild,
+  +DirectFB-1.6.3-r1.ebuild, +files/DirectFB-1.6.3-setregion.patch,
+  metadata.xml:
+  fix logic/syntax of --with-gfxdrivers and --with-inputdrivers, fix bug
+  #456112 , fix bug #456122 , drop broken video_cards_savage, remove old
 
 *DirectFB-1.6.3 (07 Feb 2013)
 
diff --git a/dev-libs/DirectFB/DirectFB-1.6.3.ebuild b/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild
index 2f81512cbf5d..0798f734089b 100644
--- a/dev-libs/DirectFB/DirectFB-1.6.3.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.6.3.ebuild,v 1.1 2013/02/07 20:15:45 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild,v 1.1 2013/02/09 16:10:36 hasufell Exp $
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
@@ -13,15 +13,15 @@ I_TO_D_r128="ati128"
 I_TO_D_s3="unichrome"
 I_TO_D_sis="sis315"
 I_TO_D_via="cle266"
-# cyber5k davinci ep9x gl omap pxa3xx sh772x
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 savage sis tdfx via vmware"
+# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
+IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 sis tdfx via vmware"
 IUV=${IUSE_VIDEO_CARDS// / video_cards_}
 # echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
 I_TO_D_elo2300="elo-input"
 I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse serialmouse"
+I_TO_D_mouse="ps2mouse,serialmouse"
 # dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev input_hub joystick keyboard lirc mouse mutouch tslib"
+IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
 IUD=${IUSE_INPUT_DEVICES// / input_devices_}
 
 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
@@ -32,7 +32,7 @@ SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
 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 jpeg jpeg2k mmx mng mpeg2 multicore opengl png pnm sdl sse static-libs svg truetype v4l vdpau X zlib ${IUV} ${IUD}"
+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}"
 REQUIRED_USE="gles2? ( opengl )"
 
 # gstreamer useflag broken
@@ -59,7 +59,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-flags.patch \
 		"${FILESDIR}"/${P}-pkgconfig.patch \
-		"${FILESDIR}"/${P}-build.patch
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-setregion.patch
 
 	mv configure.{in,ac} || die
 	eautoreconf
@@ -89,6 +90,18 @@ src_configure() {
 			|| ewarn "Disabling SDL since libSDL.so is broken"
 	fi
 
+	# fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no video_cards
+	local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
+	use opengl && gfxdrivers="${gfxdrivers},gl"
+	use vdpau && gfxdrivers="${gfxdrivers},vdpau"
+	use gles2 && gfxdrivers="${gfxdrivers},gles2"
+	gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
+
+	# fix --with-inputdrivers= logic, don't know where to put "input_hub"
+	local inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})"
+	use input_hub && inputdrivers="${inputdrivers},input_hub"
+	inputdrivers="$(echo ${inputdrivers} | sed 's/none,//')"
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable X x11) \
@@ -115,8 +128,8 @@ src_configure() {
 		$(use_enable dynload) \
 		$(use_enable opengl mesa) \
 		${sdlconf} \
-		--with-gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS}) $(usex opengl "gl" "") $(usex vdpau "vdpau" "") $(usex gles2 "gles2" "")" \
-		--with-inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})" \
+		--with-gfxdrivers="${gfxdrivers}" \
+		--with-inputdrivers="${inputdrivers}" \
 		--disable-vnc
 }
 
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
new file mode 100644
index 000000000000..8d25a51920d7
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
@@ -0,0 +1,85 @@
+https://build.opensuse.org/package/view_file?expand=1&file=DirectFB-setregion.patch&package=DirectFB&project=openSUSE%3AFactory
+
+--- gfxdrivers/cyber5k/cyber5k.c
++++ gfxdrivers/cyber5k/cyber5k.c
+@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
+               CoreLayerRegionConfigFlags  updated,
+               CoreSurface                *surface,
+               CorePalette                *palette,
+-              CoreSurfaceBufferLock      *lock )
++              CoreSurfaceBufferLock      *left_lock,
++              CoreSurfaceBufferLock      *right_lock )
+ {
+      DFBResult ret;
+ 
+@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
+      ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
+                                       layer_data, region_data,
+                                       config, updated, surface,
+-                                      palette, lock );
++                                      palette, left_lock, right_lock );
+      if (ret)
+           return ret;
+ 
+--- gfxdrivers/radeon/radeon_crtc1.c
++++ gfxdrivers/radeon/radeon_crtc1.c
+@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
+                 CoreLayerRegionConfigFlags  updated,
+                 CoreSurface                *surface,
+                 CorePalette                *palette,
+-                CoreSurfaceBufferLock      *lock )
++                CoreSurfaceBufferLock      *left_lock,
++                CoreSurfaceBufferLock      *right_lock )
+ {
+      
+      if (updated & ~CLRCF_OPTIONS) {
+           return OldPrimaryLayerFuncs.SetRegion( layer,
+                                                  OldPrimaryLayerDriverData,
+                                                  layer_data, region_data,
+-                                                 config, updated, surface, palette, lock );
++                                                 config, updated, surface, palette, left_lock, right_lock );
+      }
+ 
+      return DFB_OK;
+--- gfxdrivers/cle266/uc_primary.c
++++ gfxdrivers/cle266/uc_primary.c
+@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
+               CoreLayerRegionConfigFlags  updated,
+               CoreSurface                *surface,
+               CorePalette                *palette,
+-              CoreSurfaceBufferLock      *lock )
++              CoreSurfaceBufferLock      *left_lock,
++              CoreSurfaceBufferLock      *right_lock )
+ {
+      DFBResult     ret;
+      UcDriverData *ucdrv = (UcDriverData*) driver_data;
+@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
+      ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
+                                         layer_data, region_data,
+                                         config, updated, surface,
+-                                        palette, lock );
++                                        palette, left_lock, right_lock );
+      if (ret)
+           return ret;
+ 
+--- gfxdrivers/unichrome/uc_primary.c
++++ gfxdrivers/unichrome/uc_primary.c
+@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
+               CoreLayerRegionConfigFlags  updated,
+               CoreSurface                *surface,
+               CorePalette                *palette,
+-              CoreSurfaceBufferLock      *lock )
++              CoreSurfaceBufferLock      *left_lock,
++              CoreSurfaceBufferLock      *right_lock )
+ {
+      DFBResult     ret;
+      UcDriverData *ucdrv = (UcDriverData*) driver_data;
+@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
+      ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
+                                         layer_data, region_data,
+                                         config, updated, surface,
+-                                        palette, lock );
++                                        palette, left_lock, right_lock );
+      if (ret)
+           return ret;
+ 
diff --git a/dev-libs/DirectFB/metadata.xml b/dev-libs/DirectFB/metadata.xml
index d0c17ab1d245..1eb87809b84e 100644
--- a/dev-libs/DirectFB/metadata.xml
+++ b/dev-libs/DirectFB/metadata.xml
@@ -16,9 +16,9 @@
 		<flag name="dynload">enable dynload support</flag>
 		<flag name="gles2">build gles2 gfxdriver</flag>
 		<flag name="imlib2">build Imlib2 image provider</flag>
+		<flag name="input_hub">provides an asynchronous interface to the input devices available and those being added/removed</flag>
 		<flag name="mpeg2">build MPEG2 image provider</flag>
 		<flag name="multicore">enable multicore support</flag>
 		<flag name="pnm">build PNM (PBM/PGM/PPM) image provider</flag>
-		<flag name="input_devices_input_hub">build input driver input_hub</flag>
 	</use>
 </pkgmetadata>