Version bump.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 379 insertions, 17 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 8ccee180e9ce..3d6fef9f2b53 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.692 2013/05/16 18:41:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.693 2013/06/10 14:08:36 ssuominen Exp $
+
+*xine-lib-1.2.3 (10 Jun 2013)
+
+  10 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> +xine-lib-1.2.3.ebuild,
+  xine-lib-1.2.9999.ebuild, +files/accel_vaapi.h, metadata.xml:
+  Version bump wrt #471846 by "teidakankan"
 
   16 May 2013; Ulrich Müller <ulm@gentoo.org> xine-lib-1.2.1-r1.ebuild,
   xine-lib-1.2.2.ebuild, xine-lib-1.2.9999.ebuild, metadata.xml:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e6b42474e457..f3517e953938 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX accel_vaapi.h 4077 SHA256 0e4c485595fbe59cfebdfab8758df9c9dc78a79ab1fe49fb228a8361502e1cd0 SHA512 23dbafbc0a5cfbffbf1a8e6a2b1b7dc40bbed7665a0e1187558219011f4f1257349321bd431ad407786a9c344337585c23132435d14c83713831664e56262b98 WHIRLPOOL 880dfef81501766c4cf89b1c405974fcb61c3696d9a29ec41ff08906ec38fafba19c766db04e6c3ebb2897231b93a2152ce04473cf76b192f40215f91731e90d
 AUX xine-lib-1.2.1-ffmpeg-git.patch 2314 SHA256 31dba6743a5de05579f991cfbe09d2f9397f082f75fb4210f0b66b445898904b SHA512 c933daec1eedbbd8ac39b83e2050bbba7f7c1dcabc24beaad2fe1933e6ec3060240f0074dbdac5934aec251ccfe62279ebffc0ac5b65dde261973edf488e475f WHIRLPOOL 866965d81a2c586d616d8639d923338fd72e1ff73e25038fab84b6647ee961738964891bca84fce8a53dd103796c2114fcdd792ac7a289564cfb49f573022947
 AUX xine-lib-1.2.1-fix_dvb_crc_checking.patch 634 SHA256 6c0695a9ac6fb5b7bfbe6940847ae96f8e9836c55a2a1409e20faba13b6ba465 SHA512 cbc088e925b2506535315dc1c6656c6cc81918743f4c2aba5741afb69e1ab9176a97baa551dcdd5b345441c18b7eea07ff49b510389d00ca3b45bdf9f6ca8453 WHIRLPOOL 8572b7a11e57adb895907cb1c0948d3efad791ce68f24c60cf0ec2219bc8c760f509846b06a7f8b01c5b6c2b9b446c60be99c6e0a3c9cac8b320060f589798d3
 AUX xine-lib-1.2.1-freebsd.patch 727 SHA256 fb354f40252f0931d022d38d1c391cb55a615f5007a63f55bade30b54fe0e44b SHA512 0b2f92544df39c6673c490058ab9f7d111a5e3eb82f4abfdbe2dfc1486e0905c193274c8861c69f64b7ab931ff0643d8e6cd2f891ffebdbddf324a1d8942086d WHIRLPOOL d30ac9b344d1f69381a62d94ef56193a09b32866fa5e2b7d827e74c5b0bd16655c1b7a1ba9cf876b73f61e1b2cc2cc973a8108cd7260cff726da6b356bbbf14a
 AUX xine-lib-1.2.2-libav.patch 498 SHA256 40659374fefbc69f81e750a8b852cd9d701b40d697c7baced0807b204875db31 SHA512 53dfd3bed7c803bfe7f262e7512d02505dbb0bf96afb9997b34bb4d8df1a6f3ace98e91497bdb201ff5db43a921dea49db7586c82e312acdd48ac51e62159967 WHIRLPOOL c5578259bd7122fa45427306de713b5da74d9d1b527eb73694c7518e7c4db25b133490ccf1e1d5fcbb5383175dcd431ead9ce807c98102044327a5bbbc989139
 DIST xine-lib-1.2.1.tar.xz 4843584 SHA256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e SHA512 f1c0d1455699efa12b36b568071099bda3d6d14df3f7de958a3a03637a1fd6d289def17812bcbe726ddc05887dfc50cd99e49bed9756a6a6bac0a66a01a869fa WHIRLPOOL 395ba140292b50f5229316dd3a1765b13cb81235b9c405e2387e567ad0f194a62930c9bad66bc18fe211edb2b7324f2e6a6ed4a5f2b2e9d367d96d22b3f6eae6
 DIST xine-lib-1.2.2.tar.xz 4857248 SHA256 e1656451be64005ef296ffafcf5085d63ef7d4ee4477024391f8e3000d3253d6 SHA512 338916386adafda85bafef0dae862c49470d7b6ccf2d8c83ada7ac2f50d12746daa0ebd3ec3fd68e063e20a1f86b0508665b3a49ba493e7fa9abf22f17bd8b81 WHIRLPOOL ad43547eaa173ecbff9ee6951a484a152b273f9441a93f728d31043e1a32a0c79b8040ec28a27986216bb77c981867e13370adc15971191c6121808e4fc2c56d
+DIST xine-lib-1.2.3.tar.xz 4905356 SHA256 e06a9e01d2632530e694d4a96bba71810e2f447f9ac036d2a150c43baa27852a SHA512 1abbced7c67fe04492bb28ada9d847e82be4bbcc426378dae1056dd6b01e22b8fa78218f5a96a0947ff1e9f70ebc1ee4bb06c330b0e17ca8d7c4d9be49982887 WHIRLPOOL 0e6bfb61ce77d14fbd0a807499b2a0b3f04ac976e8b7c06a5b34be06cbecb822339451031b80c4dc8faa5265adb1883861d96d0e7dc43a0b3ebe7040b619fb65
 EBUILD xine-lib-1.2.1-r1.ebuild 5189 SHA256 940af25dae2e2cc3f7efd3bda4905be1da74892e0c77e41402616643457ce37f SHA512 160427ac99a6c905c1d733b99a3ad1a43e8d277f22c90a2dcd9938d5e3b7c90c5378136fc2df22ab13dd539fb1d9a31785d0e453301a502f004950c196b3710e WHIRLPOOL f3f840ce35527c784925cc1a29587a0dad93743e76b2bf1dff80cd427f11c8463a9af62de9d21a9bd32f22873a028c6e9109a367245d7ea08042c7abc6d06ace
 EBUILD xine-lib-1.2.2.ebuild 5364 SHA256 14007f37109ecd068d83fdc9869229a5130400646221c472faedfb998390b8ef SHA512 6556a144cd4f061a8c08b943e665c48d6ff76a3ad48933214899bbf663923dac45122cf289ab828de5da9ae663b56dde81b0ccf803385bcedfe25b0aef6b8d55 WHIRLPOOL ef32c742a4088eb2639d95319d4dc366ad0cc44b8bdf635ba805b92ee4ef42e9c90c201ec4141a329d6ccec99787f955d10e803e301b2be78746a113723fcce3
-EBUILD xine-lib-1.2.9999.ebuild 5325 SHA256 20136107f0dcee9231dfe7ee38b541014a5761570cd4e8b9234a8445f72b9791 SHA512 e5d5f0f10628b2dfb849c60bcfcfec039860160a19b77021c9366bbe2c71db7f871422f889500d337b24f3991d79cb71a3a4b93a6ea11c065c4f18894f528374 WHIRLPOOL ebefc3570028689099256cf33c4a74a2474f566c13c1605cd04f0c378b9adfa822962bfd4d8030cc430268a0cfe50ec117fb4b58086e634a3104ab32b3133bd8
-MISC ChangeLog 81853 SHA256 7de6b07f1fd9fd4677d55ef91b06c66cfaf8837abe5247b60e06d5d49a7f3bb2 SHA512 a01440964eeff48b1b5f009afd3ef82a8575935b1364ad8426190065c8c1d486f7a1c8606f72d226af7d264991d6dca1baaba8a71fa174182f82497e866c9d0b WHIRLPOOL 13194e67eff4c7c8e78fecc146a9127d138d8d9f1b3e009f5e3944f85100b1db9d65123ebee4d1b72ded81a63c781027b733e3c95ca85e4604a87c4a60ae37b0
-MISC metadata.xml 2513 SHA256 13e47c3d43cf4b094f886b5dc380dc8f8bbc6ba782ff140d9f70bd267310c0c0 SHA512 4b59e4e5fc3599396bddc6c1ad59713a3ef731bdf62bdc258236c61f9cbe5249834115de41289d04f3c648980c8692373411621701d2412a0135643326d9847d WHIRLPOOL a463f4d0ec544d1ae9c944294ff3bd6bdd1137c045cd5ead0c8d6d8f128c275d232afb74be1c851f3e971fc4d7af6600b6fa16ef15ff06f1d4e7acee00fea718
+EBUILD xine-lib-1.2.3.ebuild 5494 SHA256 b6b74ce0901a93594f32b121cf2e443c477862421fe4a44313e386f2cdcc845e SHA512 32bba0b468286a35a5f9811ee42020d5ec3535c4109469e7923b93154440bc86831f259f228e72d6a872489909f7b8239cd765f1392e74637ab7fb144ea994c3 WHIRLPOOL 0a3c8554a815d4bc4d50e2e9693069216ffccc50bff0524c4340578dc43a194ed45b630f33e4c235c673d5ed7588bec2b31140cc975797e1f67be7e9f22ac5b9
+EBUILD xine-lib-1.2.9999.ebuild 5448 SHA256 b0816c6ddf2eb65305162b65e2af9463f23c4517a012f41a460ce3771b3c8605 SHA512 54bfb9bc2e76329c485674ca0768382bf40effad84c957072905ed2baf71cb122fe99d271166c5b3bbc4c49cd8bc43bb43a6aa488393eb83f15acc49c93b4ca2 WHIRLPOOL 3b6c902b7d5d64eb7910ed66b585a9a086689624401719e80118ab694b0caa25f499debf171dfd16b092bd7c4a9994c67e316da74481405f35c10f7802e1df7e
+MISC ChangeLog 82077 SHA256 6e4d86792177eb3e55f292c0ac90703a7513779a9470aa99c3767b791caa8cae SHA512 583989d7da5f278a39f59cf2e2c5fc818e8f5a3b51eba9d5e17c0edd88518d484600c72572a74e2c4ebfcf74728473a4847cb9f8c7334a57ea9c3539869705d0 WHIRLPOOL ffbf7dcabf4545a6d66bbeaf6ee95efe6b94b3849d3968151aa17b13c09c6b32135e609eb0bf465478f45f89443911d0427015536d4db5dc751ac056fc90eb27
+MISC metadata.xml 2609 SHA256 543e9397dfe80dd63a1ed1e0b242d1f1eb7cefc61fcd8152f7b08eb9b6d3ac45 SHA512 ac17d1baa9356003e2ca8770d635705f51e9e3a246ae275dbec17f8d14b802c4ce4b9441281e12e2fb636a3c7d4d734dfaf666f1afe5494ffd0628967c831791 WHIRLPOOL 567014d0468d724c033995e2079e3e569ba1a56a9a2f4642bfc6a346e8c11933da0c0b0abfbe8299af41cfbe88d9265e6c4939070a36d6b477d058bcb8f8a159
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRlSotAAoJEJQzkH1pP7W4TrAL/2gp8P8N4hwU+uRtDhQprpyY
-s7/0uj+Ogy89xO9XziLD9PdWOB9Ms/RftotoQ6lTUe1hV6rkqBSJlLwR/ijiSOTD
-Ig/FiAIEPm8Sl+1XQHk5Hy+tK4dJOmVjf+0Jx2mJ5zRE06bd6siL6323wNwixLyX
-WXW+ZpOboqFqiPRS6rkOQlHtnMBfwJ8t5AKsqw8DjFf85O38LhEEFUJDBklKVeEB
-Dq8VtafquB6l8RZotpBiWBFFwCGzJ1cuxc/b70TprjbhZo/5hAJtbRx2Sso7ugoh
-xOIPsXzUSUuykFOfGIIFHEFsVVcFCBEgRpCNBj3eLMeh0nxqwG/X/uvhnEd5xFSi
-xG+QlSq+2fUfnmVpGQAG+0uJxvr84Iid2GW7dbqsJavraUKmiM1VpoZlIY3DjYFv
-MiKrHi1dnYk15VvK92cuYx66Y9VsVuwjNT/ldQbbu2xSV2PoRtDkESUaisFyBXiA
-UQuoWKBFl7lV1D4Oe7/lFvnIWZ/9na3bOKSjwxljFg==
-=Q1qh
+iQEcBAEBCAAGBQJRtd1OAAoJEEdUh39IaPFNPYwH/0jPbpr1lKgvpyRptNG3hYgd
+KouVRkZfS0EnFedqLYGwi0eaD7qAkPHT1QdaB6IpebiqKG98edqhEjZ00LInPyuU
+OYnHuhTFBLDmnBzCT3/gy1OL45uRuCoNoND/DdpNWKpPvT6FQT46C1plfrZHIY51
+Z1kRvO3LowwSmZ/vbISfJq+N63FWbvyje2ljH9wVR4gG3IxvENr6to8T3iTvRndI
+cAqLC+7HXbtVSGAhzYELHm7UvLLTP+fdBco2qQ720vAHGqVo/kTco+xU4zmq3mXh
+yOlU55zfo9gtCenSBmlMLv2tMIgXTTFFVZ/GmXEFeyz7azmJizQrsoeBgyfGwCk=
+=lCBQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/accel_vaapi.h b/media-libs/xine-lib/files/accel_vaapi.h
new file mode 100644
index 000000000000..666b23fd6033
--- /dev/null
+++ b/media-libs/xine-lib/files/accel_vaapi.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2008 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ *
+ * Common acceleration definitions for vdpau
+ *
+ *
+ */
+
+#ifndef HAVE_XINE_ACCEL_VAAPI_H
+#define HAVE_XINE_ACCEL_VAAPI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <va/va_x11.h>
+#include <pthread.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <avcodec.h>
+#else
+#  include <libavcodec/avcodec.h>
+#endif
+
+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
+#  define AVVIDEO 2
+#else
+#  define AVVIDEO 1
+#  define pp_context	pp_context_t
+#  define pp_mode	pp_mode_t
+#endif
+
+#define NUM_OUTPUT_SURFACES 22
+
+#define SURFACE_FREE            0
+#define SURFACE_ALOC            1
+#define SURFACE_RELEASE         2
+#define SURFACE_RENDER          3
+#define SURFACE_RENDER_RELEASE  5
+
+struct vaapi_equalizer {
+  VADisplayAttribute brightness;
+  VADisplayAttribute contrast;
+  VADisplayAttribute hue;
+  VADisplayAttribute saturation;
+};
+
+typedef struct ff_vaapi_context_s ff_vaapi_context_t;
+
+struct ff_vaapi_context_s {
+  VADisplay         va_display;
+  VAContextID       va_context_id;
+  VAConfigID        va_config_id;
+  int               width;
+  int               height;
+  int               sw_width;
+  int               sw_height;
+  int               va_profile;
+  unsigned int      va_colorspace;
+  VAImage           va_subpic_image;
+  VASubpictureID    va_subpic_id;
+  int               va_subpic_width;
+  int               va_subpic_height;
+  int               is_bound;
+  void              *gl_surface;
+  unsigned int      soft_head;
+  unsigned int      valid_context;
+  unsigned int      va_head;
+  unsigned int      va_soft_head;
+  vo_driver_t       *driver;
+  unsigned int      last_sub_image_fmt;
+  VASurfaceID       last_sub_surface_id;
+  struct vaapi_equalizer va_equalizer;
+  VAImageFormat     *va_image_formats;
+  int               va_num_image_formats;
+  VAImageFormat     *va_subpic_formats;
+  int               va_num_subpic_formats;
+};
+
+typedef struct ff_vaapi_surface_s ff_vaapi_surface_t;
+typedef struct vaapi_accel_s vaapi_accel_t;
+
+struct ff_vaapi_surface_s {
+  unsigned int        index;
+  vaapi_accel_t       *accel;
+  VASurfaceID         va_surface_id;
+  unsigned int        status;
+};
+
+struct vaapi_accel_s {
+  unsigned int        index;
+  vo_frame_t          *vo_frame;
+
+#if AVVIDEO > 1
+  int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
+                               int *got_picture_ptr, AVPacket *avpkt);
+#else
+  int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
+                              int *got_picture_ptr, uint8_t *buf, int buf_size);
+#endif
+  VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender);
+  int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec);
+  ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen);
+  int (*guarded_render)(vo_frame_t *frame_gen);
+  ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen);
+  void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
+  void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 6c2ee8ac9e34..9ec7ad94167f 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -48,6 +48,9 @@
 			is still experimental, and might not be as good looking as the bitmap fonts
 			used with this USE flag disabled.
 		</flag>
+		<flag name="vaapi">
+			Enables VAAPI (Video Acceleration API) for hardware decoding
+		</flag>
 		<flag name="vdr">
 			Build the VDR plugin
 		</flag>
diff --git a/media-libs/xine-lib/xine-lib-1.2.3.ebuild b/media-libs/xine-lib/xine-lib-1.2.3.ebuild
new file mode 100644
index 000000000000..82d3f3e69f3b
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.3.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.3.ebuild,v 1.1 2013/06/10 14:08:36 ssuominen Exp $
+
+EAPI=5
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	inherit autotools mercurial eutils
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	|| ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 )
+	virtual/ffmpeg
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusion? ( media-libs/FusionSound )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jpeg? ( virtual/jpeg )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	wavpack? ( media-sound/wavpack )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	cp "${FILESDIR}"/accel_vaapi.h src/xine-engine/
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ ${PV} == *9999* ]]; then
+		epatch_user
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf
+	[[ ${PV} == *9999* ]] || myconf="$(use_enable nls)"
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable altivec) \
+		$(use_enable vis) \
+		--disable-optimizations \
+		$(use_enable mmap) \
+		$(use_enable oss) \
+		$(use_enable aalib) \
+		$(use_enable directfb) \
+		$(use_enable dxr3) \
+		$(use_enable fbcon fb) \
+		$(use_enable opengl) $(use_enable opengl glu) \
+		$(use_enable vidix) \
+		$(use_enable xinerama) \
+		$(use_enable xvmc) \
+		$(use_enable vdpau) \
+		$(use_enable vaapi) \
+		$(use_enable dvb) \
+		--disable-gnomevfs \
+		$(use_enable samba) \
+		--disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
+		$(use_enable vcd) \
+		$(use_enable vdr) \
+		$(use_enable bluray) \
+		$(use_enable a52 a52dec) \
+		$(use_enable aac faad) \
+		$(use_enable gtk gdkpixbuf) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable dts) \
+		$(use_enable mad) \
+		$(use_enable modplug) \
+		$(use_enable musepack) \
+		$(use_enable mng) \
+		--disable-real-codecs \
+		--disable-w32dll \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		$(use_with X x) \
+		$(use_with alsa) \
+		--without-esound \
+		$(use_with fusion fusionsound) \
+		$(use_with jack) \
+		$(use_with pulseaudio) \
+		$(use_with libcaca caca) \
+		$(use_with sdl) \
+		$(use_with xcb) \
+		--with-xv-path=/usr/$(get_libdir) \
+		$(use_with imagemagick) \
+		--with-external-dvdnav \
+		$(use_with flac libflac) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_with vorbis) \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
+		--with-w32-path=${win32dir} \
+		$(use_with wavpack) \
+		${myconf}
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		htmldir="/usr/share/doc/${PF}/html" \
+		install
+
+	rm -f \
+		"${ED}"usr/lib*/libxine*.la \
+		"${ED}"usr/share/doc/${PF}/COPYING
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 4f0562e2dddd..a5833e5a44eb 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.21 2013/05/16 18:41:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.22 2013/06/10 14:08:36 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 
 inherit flag-o-matic libtool multilib
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -48,6 +48,7 @@ RDEPEND="${NLS_RDEPEND}
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jpeg? ( virtual/jpeg )
 	libcaca? ( media-libs/libcaca )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
@@ -73,6 +74,7 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 		)
 	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio[-minimal]
@@ -150,6 +152,7 @@ src_configure() {
 		$(use_enable xinerama) \
 		$(use_enable xvmc) \
 		$(use_enable vdpau) \
+		$(use_enable vaapi) \
 		$(use_enable dvb) \
 		--disable-gnomevfs \
 		$(use_enable samba) \
@@ -160,6 +163,7 @@ src_configure() {
 		$(use_enable a52 a52dec) \
 		$(use_enable aac faad) \
 		$(use_enable gtk gdkpixbuf) \
+		$(use_enable jpeg libjpeg) \
 		$(use_enable dts) \
 		$(use_enable mad) \
 		$(use_enable modplug) \