new snapshot 2015/02/20; typo; virtual/jpeg slot operator fixed

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index df67400d0458fcca28078445b698d4d2528a19ab..a26082ead6d2173d26d11e3a5d039432c36ed609 100644 (file)
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.81 2015/02/12 10:13:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.82 2015/02/21 02:14:47 hd_brummy Exp $
+
+*vdr-xineliboutput-2.0.0_p20150220 (21 Feb 2015)
+
+  21 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-2.0.0_p20130821.ebuild,
+  +vdr-xineliboutput-2.0.0_p20150220.ebuild, vdr-xineliboutput-9999.ebuild,
+  files/confd-2.0.0, files/vdr-frontend:
+  new snapshot 2015/02/20; typo; virtual/jpeg slot operator fixed
 
   12 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> files/confd-2.0.0:
   typo docu conffile
@@ -13,7 +21,7 @@
   -files/vdr-xineliboutput-1.0.5-ldflags.patch, +files/confd-2.0.0,
   -files/vdr-xineliboutput-9999-build-system.patch, +files/vdr-frontend:
   new snapshot 20130821; compile fix vdr-2.1.10; cleanup; initsciptvdr-fronted
-  to start sxfb
+  to start sxfe
 
   15 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-9999.ebuild:

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index d47553faa1d5b10d52d5dee3406fb866527f1e24..21bc9f61769a43c456a0162cd362881127dbd2f0 100644 (file)
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA256
 
 AUX confd-1.0.0_pre6 856 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b SHA512 67ab65984c2176edb7b3985b4a561bb41c8c529796d5cc44f559e275240c0c25bfee9e340744c7f25192de8a5231ff94f0bc87ace0edbb5b496846b0f8017fed WHIRLPOOL 7e9714a0b79c5cdf16fc57b3ad7a9b24b7c6591f97612cafea76dbb4c54857d881c6eb6e076d8561b14c8c08345ab94c40cff9c6f98c6196ead4aa94425375a5
-AUX confd-2.0.0 1468 SHA256 00b840018787eb2776ccfbbc85afafc53344322d4ed64421da60629166a59428 SHA512 9ee168477271bff6cf403e88418d0c36ba638286c333ab4189235b36198814ef687052f71a8239b04a6056622743e9ec2136fc3d46eab784d857d814ad65556e WHIRLPOOL 6ecbff7578c88d88fe2f70029aa0229923943e79a0ac21a3c4f372cba4a15b7b7a49a43a0b2a04a83d53e3bcd18a9b8c33f5fd878217cbba288e071fdf8fc74f
-AUX vdr-frontend 527 SHA256 74e558456dc042dcf59cc6c13c843522ca4256e51d6a3d5366d012bf9381be2c SHA512 6ed787ceee4d1a04a06aace49ae5daf97333e385799cf19de152f3c63f1d0f409e006f896772f9d64c2301d00025bd67499a6f4688b117adcc71f0cc7088e7a0 WHIRLPOOL 68879d37f3bb0665e719095f620a9a7f1e7a21be3bdaf24372182f498a87c95b43460ad1fb79fd4701d89b27668a34ca91bf4f6782e52ed74f00042c3cedd67e
+AUX confd-2.0.0 1476 SHA256 b0b7c39c58d6a40bd639c031c8526de856aef77c08b46a1f232549c29a7e147e SHA512 8ab8b99e770dacbaadfc97ccc80f3d2c857bf95b662b9152959ccd88b940f4d2f7d2957ea4f6390f30470aca809cb3bb04b8b9e696122131fbb6d9f5d010f579 WHIRLPOOL a6e5995a755fb3e91432b2bcdaf98b1c43d8d18d06bdde3f4ca1032a82cb8556d95d0c245e5196c768f3d5d879c8eea39b5ebc795e5045ed3b8c10f660330663
+AUX vdr-frontend 527 SHA256 f47ced1571b0ea63b40a62ef1d7311792a24d35237c28811a9f1f9f333b300a8 SHA512 28d1da968eb48a2635b389a78a8f5b18238f88b93a2bced5991ce92c207509ea46703e303ce63866fecf18635f18865466de16551651fe9400d0d24477534e3b WHIRLPOOL 03beec9e77e41c729a301a5ae56579a026e48a3590f4929939a6bfba00f75b3e13b13efbd68b32b5621577b77d2ce48bf8183a0ea297e3f8d0d5db45b25a12c0
 DIST vdr-xineliboutput-1.1.0.tgz 404820 SHA256 bddebfbf77e956a50faea1baa44513a31122961357bc502b588c521358da77d3 SHA512 255ae698c1dc9d9098847e62c386a6bd24ec1dc822fb695600ef944e18d0febfac0d5b487de57a17ea9f9bd3935d1d11763a06a5daa527ce95f9557a408c264d WHIRLPOOL be47aeb039bb69e85a0f964940b3173f4371ae911d58df76c6e0135b9843471cd21b27efdfc95001216a508c0bbdc1e4957cb0d50da1a3c49e7c4ba7dd24e55c
+DIST vdr-xineliboutput-2.0.0_p20150220.tar.xz 326520 SHA256 5fac9ed279ab2d5a9a4697a1745560901887fd60a9b1dbdd04f6d8ee5d2dccbf SHA512 8e3a6fe4dad4875b1e2d2c6667e1c5d8f4542742fb74c40148aa5dc403b86743c32a49e1fb0979a59c312aaff4c038347f934105b0ca8d3097b61c59021966f3 WHIRLPOOL cb8958ec5bc2ff76544791e2362b3f89ed9cb4f9e905052fb6b7f42f341399d8ed112694a69205c1759b49f23b1416892e7f70a73816f9d630004d7aebf6fcfa
 DIST xineliboutput-2.0.0_p20130821.tar.bz2 356633 SHA256 3ccff26c1112267e12858bbacd1d9081c999881da77c0da91f1fcc525cc225e9 SHA512 ee25447749dc5b8fe93da3c021823f8dd552619d64575525918c15447135af0d6684e613b20a1aa99a1fd8bd5334344ea03962ab75bbbffb0204d92adf36f9ed WHIRLPOOL 1feabc1f333593fb194065d1a62a0da80374a6c9714c8e1af4623e047ed4f0ef6c5433e8401f072e7c4a460830c2d1b902ce2a78f7ecad5e8533b159eda6db00
-EBUILD vdr-xineliboutput-1.1.0.ebuild 3351 SHA256 dcd1fb307cfc8fe679079f9d163b4eb5c2b77ab4e51cc2838ccd5b1051880636 SHA512 cb292b5da5cc574ff9ed3ba4b40ce9243b7bdf580ae3af39748e0414b189259737b7a1c4a0a91981c3a77f2d793fe8dc98874c05dea507a251d1ef1add425272 WHIRLPOOL b302e65d8fba224f06d6a9d2a1f40b21afbe9fb965943d111bf535f4af5e17716b82dac04b013219c2e29b1b4ba91e1e82a9f71b517df945cf1a8a9cc9d955ef
-EBUILD vdr-xineliboutput-2.0.0_p20130821.ebuild 3460 SHA256 a24c128ffca4fa7e565ed6619fc71658341b113729403e234009435af3856dc9 SHA512 75209d87d014a6e936097b433bb9c05e5562d12c158c01fa372a78d92a0f1c475357c9db7ef1b7348f6d22f53ffda3bdad5be6d0bfc44d3b2ac16950987d86c6 WHIRLPOOL f582d46a73aca0fb2f10c9a8cfac09292e43f04783f91a41d9289dd59fc4e5c022e2b61b439720730007b94a952a02843ebcb462152d0fde4714f27b02b36b95
-EBUILD vdr-xineliboutput-9999.ebuild 3503 SHA256 eb7367d009b0fc65971b57d1794c796eeaa0b407fa99941e98d98b520796d0cc SHA512 e8b442596ce63f9e8904e4627605a7a92be70d659dc4be43a27745e2a6b2eba03255038c66c3cd2806c031a36316b8deb66d7596da6a7da8227c7380864b486c WHIRLPOOL 535fa419cd89d1c3ab6f285ddb4cade135c7b9f3951967dcee4193252cf20fc9ebb2d66b7ff9f1440e7368f7e189a731e31cc6a47c01122ad5ce2de0bdf752d6
-MISC ChangeLog 16494 SHA256 745177c6a0de3b5147c3f1bd74930f11d966f013a584127755fcc3226fd85847 SHA512 118761e3ec1adb2a339af87230a97f81a8129346791f9a5fd5a6a6ede3215da7ab350e4ffc98731d51a0b9ac5bdf9ae4904932ca7fec800a07ab23188cf49bd0 WHIRLPOOL 172664708e4fa8a6c50a29f0ffa08cf5293defcd63389730296382e20829b7b4c8ae1f80726aaa2dbc784583ff06c444ead240340d40869dc8e95a793c9d5b31
+EBUILD vdr-xineliboutput-1.1.0.ebuild 3355 SHA256 dced038a57aeaad1fe6a0ccb215b390b57c3552ff4db30d543202dc9e6952c1d SHA512 79c101cae3878b2892fda21f77a38874e554ade1f0006890d4ad7505880852bad9c25441e755c20c1f90c755902c356733345a8c23fd8f637e18f329a3db1848 WHIRLPOOL 8f6fc9518ea5489f0f5cc6fd0d94711fc17e078a01563e0dd303a5db07fde2ae086676bee04d13e505e46cc8db786cab96151e7a789b9d1f6fc8b8d6b64ae6ff
+EBUILD vdr-xineliboutput-2.0.0_p20130821.ebuild 3464 SHA256 853bc9745367b26deda2e33f937485fab42271a1ca43ed738c1d945eb56cfeec SHA512 fa3a8794af340434c664c73bf2a81a24cf9b03503d1a2fa90b7e3e93041f058b5ff2b2a4f871f1b09a82a2a20ce73560ac53acd07a9a60f9efb3576f2a19149f WHIRLPOOL d5b5d7d7bfb5d65dd6b9f980e77b42e91347cb54b4f23d6aeaf6182c96b5f4101bd067814c43eb01924a65975a44f3a632382d76a74efc48f09393166d1f65a4
+EBUILD vdr-xineliboutput-2.0.0_p20150220.ebuild 3197 SHA256 eb184d3a40dfe52aebdd2ceddca1cedbde1e6fdbc091e93912f192f1e0d6318e SHA512 9c5aec3a710f4177e7b25c2800cba3917f94510f05a8b29609788cce9f223536b24ebcca13febc53ada90cadf0a6c02f322ab2aa0c4ee3e37fc2db31507b9a50 WHIRLPOOL eb1a4b39384decc56c35309a8ebca16ad2b8d67586869854010639440da88c6a54bedc53b625298696e642fd52e6dc4983f8c47437d92f1d2a5c915e90bea703
+EBUILD vdr-xineliboutput-9999.ebuild 3507 SHA256 d3f7c1edd242f057694fd4f40b5486525f6e1b9fee561aa7066a4b0113cca161 SHA512 107bb0da807cd3a7aae43660e278bf44561efae7632469df72d09f673c51f7b9613faecad321053180d397a779e5965967dca53a2ff896fd685965fabaefc5ae WHIRLPOOL 2261bc1e6fdc9bc48e683dba500dee435a46bcc8ac475fae35232ed2452e10956b2477dd8447b0af88480d7bd7cd15fa49147963879c65c8e0e09fa2dcf79a5e
+MISC ChangeLog 16859 SHA256 f33ee0162a800e72f25eadc86b892b96f7107d088b4943e26f1b9cf96922ad88 SHA512 2fbc4ecb4e5a2e54ac2b6a5a1acb5cb3927515c80593fac91392d496b13b344b33cb493e29f9a38bbc02444e3b87a13471aa6e585710130f2bb904ca382724a9 WHIRLPOOL 52938993a807a7ff24bc0c2b85652a33576f5bf039a7d57df2104f659e5eb101d616aa02fdef160a3fb53dc898a27d4120c19f7aef3686ff1de05ba71cc7535a
 MISC metadata.xml 841 SHA256 3dc039001ddd3c3a6630f615fb2e94261f369931cd73cd5405644937145bb189 SHA512 9afc4d17ddd1e4d0bfcfb86ed2e1b4587c333e40950e2b8a3b7b92b09944a34bab4621f097d7bcc72878abdcc3cbef3b5733ab1f913e0bff044987838477fe94 WHIRLPOOL 73885acc6772ad53abaacb9416f64f9a7b6f29078cce1adf052097770a051631cb59f1e549031c9f2a1214f86e0ba0cbdae2b33cc2304481fec3e4bd16da5af0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFU3Hy8dn07HTTCgIoRCJr2AKCVlZR50KD5KhupIKKD50lnsmdLGACdFVPy
-N3vKHOHhJG1YSGY+MLsxPaU=
-=d8Ec
+iD8DBQFU5+ofdn07HTTCgIoRCDzqAJ9RtlB0xQ9e/3g7zzwZCICjl1sSRQCdGgJs
+xe9TbvUdxcO+0Yhpv23z/h8=
+=6Zhw
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-xineliboutput/files/confd-2.0.0 b/media-plugins/vdr-xineliboutput/files/confd-2.0.0
index 3de3a4dac7b052a555c1492e183a394f2dad0916..07da46ff5d21af0f1f7acdc7bf36c6e5551eb413 100644 (file)
--- a/media-plugins/vdr-xineliboutput/files/confd-2.0.0
+++ b/media-plugins/vdr-xineliboutput/files/confd-2.0.0
@@ -40,7 +40,7 @@ _EXTRAOPTS="--local=none --remote=37890"
 #
 # init script --> vdr-frontend
 #
-# DEBUG: do we need sxfb support? feedback please!
+# DEBUG REQUEST: do we need sxfb support? feedback please!
 #
 # sxfe start parameter
 #      allowed values: see README

diff --git a/media-plugins/vdr-xineliboutput/files/vdr-frontend b/media-plugins/vdr-xineliboutput/files/vdr-frontend
index 56be30e87d8c3b0fd7bded01c067d17faae244cb..bcbfb73ad0a58178cfe27d9c6bb5b651721cdd3c 100644 (file)
--- a/media-plugins/vdr-xineliboutput/files/vdr-frontend
+++ b/media-plugins/vdr-xineliboutput/files/vdr-frontend
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-frontend,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-frontend,v 1.2 2015/02/21 02:14:47 hd_brummy Exp $
 
-description="Start xineliboutput sxfe/fbfe remote frontend"
+description="Start xineliboutput sxfe/sxfb remote frontend"
 
 source /etc/conf.d/vdr.xineliboutput
 

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
index 4601c8dd5df0f3a94478fe5ca8d2e87e3745b9db..3505d90d297ab94ea8a87e0341a3b52fe2743a92 100644 (file)
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild,v 1.6 2015/01/15 18:52:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild,v 1.7 2015/02/21 02:14:47 hd_brummy Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ COMMON_DEPEND="
        xine? (
                ( >=media-libs/xine-lib-1.2
                        virtual/ffmpeg )
-               fbcon? ( jpeg? ( virtual/jpeg ) )
+               fbcon? ( jpeg? ( virtual/jpeg:* ) )
                X? (
                        x11-libs/libX11
                        x11-libs/libXext
@@ -35,7 +35,7 @@ COMMON_DEPEND="
                        xinerama? ( x11-libs/libXinerama )
                        dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
                        vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-                       jpeg? ( virtual/jpeg )
+                       jpeg? ( virtual/jpeg:* )
                        bluray? ( media-libs/libbluray )
                        opengl? ( virtual/opengl )
                )

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
index 5d146436a2353a8aea9b3fa8a635fc5d1cbf1327..f9364dc7c5d828e3c3c2d4428ca24847d6240d02 100644 (file)
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild,v 1.2 2015/02/21 02:14:47 hd_brummy Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ COMMON_DEPEND="
        xine? (
                ( >=media-libs/xine-lib-1.2
                        virtual/ffmpeg )
-               fbcon? ( jpeg? ( virtual/jpeg ) )
+               fbcon? ( jpeg? ( virtual/jpeg:* ) )
                X? (
                        x11-libs/libX11
                        x11-libs/libXext
@@ -35,7 +35,7 @@ COMMON_DEPEND="
                        xinerama? ( x11-libs/libXinerama )
                        dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
                        vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-                       jpeg? ( virtual/jpeg )
+                       jpeg? ( virtual/jpeg:* )
                        bluray? ( media-libs/libbluray )
                        opengl? ( virtual/opengl )
                )

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
new file mode 100644 (file)
index 0000000..99f11f6
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild,v 1.1 2015/02/21 02:14:47 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+       vdr? (
+               >=media-video/vdr-1.6.0
+               libextractor? ( >=media-libs/libextractor-0.5.20 )
+               caps? ( sys-libs/libcap )
+       )
+
+       xine? (
+               ( >=media-libs/xine-lib-1.2
+                       virtual/ffmpeg )
+               fbcon? ( jpeg? ( virtual/jpeg:* ) )
+               X? (
+                       x11-libs/libX11
+                       x11-libs/libXext
+                       x11-libs/libXrender
+                       xinerama? ( x11-libs/libXinerama )
+                       dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+                       vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
+                       jpeg? ( virtual/jpeg:* )
+                       bluray? ( media-libs/libbluray )
+                       opengl? ( virtual/opengl )
+               )
+       )"
+
+DEPEND="${COMMON_DEPEND}
+       virtual/pkgconfig
+       sys-kernel/linux-headers
+       nls? ( sys-devel/gettext )
+       xine? (
+               X? (
+                       x11-proto/xproto
+                       x11-libs/libXxf86vm
+               )
+       )"
+RDEPEND="${COMMON_DEPEND}"
+
+REQUIRED_USE=" || ( vdr xine )"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
+
+pkg_setup() {
+       vdr-plugin-2_pkg_setup
+
+       if use xine; then
+               XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+               [ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
+       fi
+}
+
+src_configure() {
+       local myconf
+
+       if has_version ">=media-libs/xine-lib-1.2"; then
+               myconf="${myconf} --enable-libavutil"
+       else
+               myconf="${myconf} --disable-libavutil"
+       fi
+
+       # No autotools based configure script
+       ./configure \
+               --cc=$(tc-getCC) \
+               --cxx=$(tc-getCXX) \
+               $(use_enable X x11) \
+               $(use_enable X xshm) \
+               $(use_enable X xdpms) \
+               $(use_enable X xshape) \
+               $(use_enable X xrender) \
+               $(use_enable fbcon fb) \
+               $(use_enable vdr) \
+               $(use_enable xine libxine) \
+               $(use_enable libextractor) \
+               $(use_enable caps libcap) \
+               $(use_enable jpeg libjpeg) \
+               $(use_enable xinerama) \
+               $(use_enable vdpau) \
+               $(use_enable dbus dbus-glib-1) \
+               $(use_enable nls i18n) \
+               $(use_enable bluray libbluray) \
+               $(use_enable opengl) \
+               ${myconf} \
+               || die
+
+       # UINT64_C is needed by ffmpeg headers
+       append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_install() {
+       if use vdr; then
+               vdr-plugin-2_src_install
+
+               # bug 346989
+               insinto /etc/vdr/plugins/xineliboutput/
+               doins examples/allowed_hosts.conf
+               fowners -R vdr:vdr /etc/vdr/
+
+               if use nls; then
+                       emake DESTDIR="${D}" i18n
+               fi
+
+               if use xine; then
+                       doinit "${FILESDIR}"/vdr-frontend
+
+                       insinto $XINE_PLUGIN_DIR
+                       doins xineplug_inp_xvdr.so
+
+                       insinto $XINE_PLUGIN_DIR/post
+                       doins xineplug_post_*.so
+
+                       if use fbcon; then
+                               dobin vdr-fbfe
+
+                               insinto $VDR_PLUGIN_DIR
+                               doins libxineliboutput-fbfe.so.*
+                       fi
+
+                       if use X; then
+                               dobin vdr-sxfe
+
+                               insinto $VDR_PLUGIN_DIR
+                               doins libxineliboutput-sxfe.so.*
+                       fi
+               fi
+       else
+               emake DESTDIR="${D}" install
+
+               dodoc HISTORY README
+       fi
+}

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index afcb0ce148c8e6878ae7fa412f8a4c2613768f79..56374556be173febdedf2145da2f27c63492a610 100644 (file)
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.19 2015/02/12 10:11:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.20 2015/02/21 02:14:47 hd_brummy Exp $
 
 EAPI=5
 GENTOO_VDR_CONDITIONAL=yes
@@ -28,7 +28,7 @@ COMMON_DEPEND="
        xine? (
                ( >=media-libs/xine-lib-1.2
                        virtual/ffmpeg )
-               fbcon? ( jpeg? ( virtual/jpeg ) )
+               fbcon? ( jpeg? ( virtual/jpeg:* ) )
                X? (
                        x11-libs/libX11
                        x11-libs/libXext
@@ -36,7 +36,7 @@ COMMON_DEPEND="
                        xinerama? ( x11-libs/libXinerama )
                        dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
                        vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-                       jpeg? ( virtual/jpeg )
+                       jpeg? ( virtual/jpeg:* )
                        bluray? ( media-libs/libbluray )
                        opengl? ( virtual/opengl )
                )