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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 128 insertions, 21 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/Manifest b/dev-libs/DirectFB/Manifest
index 2e8ad4f35185..d2e4fc5071ef 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -8,20 +8,21 @@ AUX DirectFB-1.4.9-libpng-1.5.patch 10474 SHA256 dd52c23ca3c32ef72181ee41c74658e
 AUX DirectFB-1.6.3-build.patch 991 SHA256 6bfdf49846df444d3fe7deb54a353c1de7de8691b43b36d99948ebb94d7d21de SHA512 86010f437be16637cd8b07a7cbba9c960d611b63f7d44075796549879cf52f6f411eaaf772a909cbeacba135c587945ad9f4caa18b40b4220ccefe192fac2f54 WHIRLPOOL 00b914062aae827f0123fecd49d48f25c965fc8e0810cdd808f970e6b8707c8a7c75ddfd449e68032b3a413e5ee4d8afb03e25c48db8df488e5790fa723a80f4
 AUX DirectFB-1.6.3-flags.patch 389 SHA256 8217a2f5b4d5cefb47d9f7d01561de0e2e56a57c4a808420bf6f3ff7e9872268 SHA512 db3261f7d1e1c17fc5496920ea7ff6ecf18b11cf0898783298ff03e62a8b5b703a5e2f1ceb887a2276248bc9df49d10ed7b99a63ee31b3ad5e97a3b6d7ad6614 WHIRLPOOL 76885ca75c805b583792b23c8f9260e62562a7ee0988150789f4bb269742e1a8700a9e108c64bcb7f7cfc6938a4aa48172967db18ae967ee27279629cec3dd38
 AUX DirectFB-1.6.3-pkgconfig.patch 664 SHA256 5e77090304e4096665728a1c24f251fff3e97a693692afb12986ba5565ac96f6 SHA512 1ce162ef7af5ab7b6efcdb786e9e89d569051f2009d1144744befed57ae36109771284b302438c882b550e09a3ced814b550fa039306b4f37c7e1b68675943a7 WHIRLPOOL f5185c2c4b5f1d1252b0067734a4f07299640cbeea67db06da63de96a1ec0d287c4c111e0b6f2621d3ab2a3775e57dd295dade01eecad3ea7ba133e6ff35b37f
+AUX DirectFB-1.6.3-setregion.patch 3812 SHA256 35c1e46e49d8b9880e177272b83a2fb47b9eed5346bc1ac36697e23c3f0c967c SHA512 98510a4a40daa46c9d5aa824a09584ab2d1e4a0a5b885fc2893e8af99b16317e5c89279f2889d94545451b63039d24909e8ee051788bce704d403e3fb7ef46af WHIRLPOOL bc2b84641ce91eff97a87265a44aea7132dbe777a0ab9ddef701d706962879fcc390fff4a7194653f903d4a0a038b22f6bc125a4efdb3291a8d14edc35136a29
 DIST DirectFB-1.4.9.tar.gz 3095137 SHA256 988a40dbc81fe1ecaf69a3581ed49bf4f6bbb584cb54de24cba154d3ada7a228 SHA512 ec7e03f9f3bfffafd0d84676b79845fabe59d61ac278adf4e3cd03562638529a24ff76bd606c881926cae335da00f71541e2245d0aecd4af957b95ea66c7d969 WHIRLPOOL 310c079e0f396828ddfdec0695e26a04fbea2a8a9fd90066212cf70e94a371c8b0f8b29141374db788ac247a92d01e19b0d1ddc36c78beefb6cef5aeefd173e1
 DIST DirectFB-1.6.3.tar.gz 4296908 SHA256 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 SHA512 86fb98951a4dc579b0d60e96976e6d85bf99e35f2fbd0d5f7cdc3d7c9ea0242052ff8dbb46bfb093e70439158cda37000e67d2a05265d3a6d2e7ac7231c2ebb7 WHIRLPOOL ce9d1f3a1e7e9aaed3572244390c0dec87faa5e8af1a58153ad849774e08be0037f42983852de323cab745dc6b3d018640ec2d5987270b6a4b5ab7595bbd97aa
 EBUILD DirectFB-1.4.9-r1.ebuild 4106 SHA256 0d929a96b66c51e6262104673ace0aeb913b3d014cb54df0ffdb5651be8abeaf SHA512 06bc862108effb7939e7428fcf725d39735ddbe5e1ceb902058dc055c52d9bf3ccb4cc4b9b307d3a8ce35e641746f3b429ac5604b4f674556b0f561dec9d6468 WHIRLPOOL 0a28e06359d23ef793ed91730d37ab25ee4f094c016f01308146dea9974ddab72c203bb6dfd5394ba35a5ae47b6490ceaee109fede823d69b361fa48481e8d9d
-EBUILD DirectFB-1.6.3.ebuild 4535 SHA256 1e663ad754f2f06666c09c8bb7b148d1dfccd3b95a17d99b275296ede7d38a66 SHA512 31b7b40341514e5e5e90127e60b6531162a4b36cae76f0e0b3bc26c15d213b647c0fc63f248aaacfd23b3f2b071c905c854913b25114b44880ebc245c619f5c0 WHIRLPOOL adbd51c2bf36a338cfe87d3b55327576aca35a2ac6312a849dec2a60c8a3a6c24441c1f9868443d851193e3086baf9725829c35f73120590274923c948983b2c
-MISC ChangeLog 18119 SHA256 89269da242b7ebbf32a18bc13639abbe6b8082580f801699b4f67824ebbb2a0f SHA512 60b8a9356e4b64e7ff3ab7f2bd62b5a9205bd07292b3f80c97c722d2deec213a791ef32c875e8af30c56f366bde02434f66f10392d0857a230d753556d64dd59 WHIRLPOOL 9bf59bc3b831672f1558b0bde55b198ac9e1b9923778520813d86aabdf5403bb0a817703d915a4b2e73dbc4d46732b2891aca9216c97202eca85db0f86eaefa6
-MISC metadata.xml 1187 SHA256 5dca4b889a88bab969b14418c67fe31a311768e62c7c5f44406baa28efa11c70 SHA512 bb59cfb0851e6d872f1e255099738f25dd54a93c63b08c40fefa232fafbf74eae5e908d6c69cadda860f13763706809279467d7cf8731f00aa323f235cfd9a81 WHIRLPOOL 11270fe3c209035ab2a85b35bcae351775932d2d0aea1a186b38e70e8155bf4ced9d3a6260ae98eedc0f8ba23ebffa9a060458a7b3bbcf9f5efb2e3986406d09
+EBUILD DirectFB-1.6.3-r1.ebuild 5046 SHA256 bb608a066ae87deb3e458c6b36c738d7c131093a680c84f9b393cce29ff61cf5 SHA512 3ac6dee8fc68dfbe080f6a93df04d697315d1f161134b9b01fe7fc13ac5f920eb64fc9d182efd96532a2eae1ff81e0df161916aa2312817f91159e36414bf0b0 WHIRLPOOL 2996d7de46d90eac08f3c3c9c4de335bf1a3bc0f4ff3073a4e0c6000f81431b0e7ea8d512aa86411f23d96b612c81b89cd32411d7743e344bf79ddd9ae6f1f3c
+MISC ChangeLog 18459 SHA256 478a91f04a1c2794a0837e13dfc7f0d9cfacaf6c98e98be34cbb913666faa42d SHA512 59ffdad9544fd495376ed09efd45ddaa897cce8777b2f275944b7fb736ad58f5062ac322ead086f8b0700b24bcca58dfd5be689a7062d6246b629ebd669a3633 WHIRLPOOL fa2180d394d86cd327691430fafb63ac7242ec8ec3426a5b91138569bb18fe7064061854514ef5bc6b052abb75495cbfc1313e9fb54d8f8b2cb3a73a660e2765
+MISC metadata.xml 1240 SHA256 96d7a370455d9f063642951300909c5bcad226551a2e046de1798821b92d1293 SHA512 2a65df8f061b4e14e57c5a09d2578b7384d6eb6c5fbf09b46470706258982323577d0ff3ab72451637e05b9939561b0270ea5d69c385ffeaf9d9c34d4f62f1dc WHIRLPOOL f5149f43bc64b03fbc354e32f66fa0be1b5d6563492b6426124bb4baf6147c1ee2cee2f62ecb5807ce1e7528eab129d1274bfdaba47130a6111e74752785e1b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRFAtzAAoJEFpvPKfnPDWznqAH/2TU4MRQxrl35fBQYT4T5zfm
-3g+2tKH0LWqqsNg1E2rimyxUaXx0O+NfVVIP+7o1EGM9BwKhY3ETQDFkz4OEbvsp
-IKzmUuGVvR9jAwuY/o1B+2HHEOLaM5p1PHiLV4U8mhzxC5A9T9/vHCzBFuTeQqby
-2+nR6zU0UN52Q0+JnUCxafXORYBhXnPf2RQEjMHSt02Z7tWguCK91mZo+hKoAyNp
-BOKg6r4qUX2RgvUkM2fkZapvM0AiOOIig00C/3XSzZc1ormj8syeZIYHNi1m5NE5
-YVR+SUCWZfPnB2T2qIE4RBHIWqzoOmm7ihSL9Mn3LjLHwg5rwNfGApTVT7hMwfk=
-=+HkT
+iQEcBAEBCAAGBQJRFnUAAAoJEFpvPKfnPDWzfvkH/2Y6ouroOTVtiwAb5KDtpQdR
+s/DjKTzFgCIrL75SCUgyM17X10ttOB23R2K9dIfVbS5Q3N5fCDYLl6x5STpSCO1c
+0LKGKPb3jvV1XnNIKQGUeRBXen8seHg7mJaqvanfiPY+3+2M5eqfE6Hq/Oby4cdP
+bF8Y0qxh+a9QrXxhFy/paYqYl+/LeRkjjGg/6g4H88JM68tHvGM6053zrcP5dSnL
+m1lnFTkKsNRm12nJd/Kv+UemMrBvX6eaEpJtqpfkseUsr4EOfQ350d1dVmLiJDYF
+Iutkd69ueTZuZ2zAlFyuig499/5fRGBKEmcGyg0X+5d8/Y9FBCYuGudDcoPAnCs=
+=3Op2
 -----END PGP SIGNATURE-----
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>