version bump

(Portage version: 2.1.2.3)

6 files changed, 48 insertions, 263 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 3aac2dd186a2..0cb5da3ccbf1 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.72 2007/02/18 16:03:39 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.73 2007/04/13 23:49:54 genstef Exp $
+
+*kaffeine-0.8.4 (13 Apr 2007)
+
+  13 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/kaffeine-0.8.3-xcb.patch, +files/kaffeine-with-xcb.patch,
+  -kaffeine-0.8.3-r1.ebuild, +kaffeine-0.8.4.ebuild:
+  version bump
 
   18 Feb 2007; Simon Stelling <blubb@gentoo.org> kaffeine-0.8.3.ebuild:
   stable on amd64; bug 165694
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.8.3-r1 b/media-video/kaffeine/files/digest-kaffeine-0.8.3-r1
deleted file mode 100644
index 04b39d433e2b..000000000000
--- a/media-video/kaffeine/files/digest-kaffeine-0.8.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 667dd56cf02f1343b3a466a685afdf24 kaffeine-0.8.3.tar.bz2 2940941
-RMD160 f22a971481e8fd1a96063fef66d156d119c1e596 kaffeine-0.8.3.tar.bz2 2940941
-SHA256 42719f4eab6a27a06ec247369424f5a9d796fca74672573c467d024983a861b2 kaffeine-0.8.3.tar.bz2 2940941
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.8.4 b/media-video/kaffeine/files/digest-kaffeine-0.8.4
new file mode 100644
index 000000000000..34db59855700
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.8.4
@@ -0,0 +1,3 @@
+MD5 6f62ebb7a6f88ff49f452856a1660d95 kaffeine-0.8.4.tar.bz2 2903979
+RMD160 fd6a296a8e58a7a1165e91b0f8ced37fda968ffd kaffeine-0.8.4.tar.bz2 2903979
+SHA256 a15ad9f6b154ef1c83f3d0e818f94efd7ba6c2ae4e6affcc9d28afacb701df74 kaffeine-0.8.4.tar.bz2 2903979
diff --git a/media-video/kaffeine/files/kaffeine-0.8.3-xcb.patch b/media-video/kaffeine/files/kaffeine-0.8.3-xcb.patch
deleted file mode 100644
index babe90baa2dc..000000000000
--- a/media-video/kaffeine/files/kaffeine-0.8.3-xcb.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-Index: kaffeine-0.8.3/kaffeine/src/main.cpp
-===================================================================
---- kaffeine-0.8.3.orig/kaffeine/src/main.cpp
-+++ kaffeine-0.8.3/kaffeine/src/main.cpp
-@@ -30,8 +30,6 @@
- #include "kaffeine.h"
- #include "version.h"
- 
--#include <X11/Xlib.h>
--
- class KaffeineApp : public KUniqueApplication
- {
- public:
-@@ -91,23 +89,6 @@ int main(int argc, char *argv[])
- 	if (!KaffeineApp::start())
- 		return 0;
- 
--	/*
--	 * XInitThreads() should the first call to xlib in multithreaded X programs -
--	 * but because of a bug in some xfree versions that can freeze at startup,
--	 * we also call XInitThreads() in kxinewidget.cpp
--	 *
--	 * kaffeinepart & konqueror: We call XInitThreads() in kxinewidget.cpp, so the part is
--	 * not stable with buggy X implementations.
--	 *
--	 * FIXME: deadline for this workaround is 2007-03-16 --pfister
--	 */
--
--#ifndef XINIT_WKRND /* configure flag --with-xinit-workaround not set */
--	flush(kdDebug() << "if kaffeine hangs here run 'configure --with-xinit-workaround' and recompile / reinstall ...");
--	XInitThreads();
--	kdDebug() << " ok\n";
--#endif
--
- 	KaffeineApp a;
- 	return a.exec();
- }
-Index: kaffeine-0.8.3/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-===================================================================
---- kaffeine-0.8.3.orig/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-+++ kaffeine-0.8.3/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-@@ -38,10 +38,6 @@
- 
- #include "kxinewidget.h"
- 
--#ifdef HAVE_XINERAMA
--#include <X11/extensions/Xinerama.h>
--#endif
--
- #ifndef USE_QT_ONLY
- #include "kxinewidget.moc"
- #include <klocale.h>
-@@ -68,7 +64,7 @@ KXineWidget::KXineWidget(QWidget* parent
-                          bool startManual, bool verbose)
- 		: QWidget(parent,name), m_startXineManual(startManual), m_xineReady(false),
- 		m_logoFile(pathToLogoFile), m_preferedAudio(audioDriver), m_preferedVideo(videoDriver), m_xineVerbose(verbose),
--		m_xineEngine(NULL), m_audioDriver(NULL), m_videoDriver(NULL), m_xineStream(NULL), m_xineDisplay(NULL),
-+		m_xineEngine(NULL), m_audioDriver(NULL), m_videoDriver(NULL), m_xineStream(NULL), connection(NULL),
- 		m_eventQueue(NULL), m_osd(NULL), m_osdUnscaled(false), m_osdShow(false), m_osdSize(0), m_osdFont(NULL),
- 		m_audioChoices(NULL), m_audioInfo(NULL), m_videoChoices(NULL), m_videoInfo(NULL), m_mixerInfo(NULL),
- 		m_osdShowInfo(NULL),
-@@ -239,12 +235,12 @@ KXineWidget::~KXineWidget()
- 		delete [] m_audioChoices;
- 	}
- 
--	if (m_xineDisplay)
-+	if (connection)
- 	{
- 		debugOut("Close xine display");
--		XCloseDisplay(m_xineDisplay);  /* close xine display */
-+		xcb_disconnect(connection);  /* close xine display */
- 	}
--	m_xineDisplay = NULL;
-+	connection = NULL;
- 
- 	debugOut("xine closed");
- }
-@@ -831,7 +827,7 @@ void KXineWidget::videoDriverChangedCall
- 	xine_close_video_driver(vw->m_xineEngine, oldVideoDriver);
- 
- 	vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine,
--	                    entry->enum_values[entry->num_value], XINE_VISUAL_TYPE_X11,
-+	                    entry->enum_values[entry->num_value], XINE_VISUAL_TYPE_XCB,
- 	                    (void *) &(vw->m_x11Visual));
- 
- 	if (!vw->m_videoDriver)
-@@ -840,7 +836,7 @@ void KXineWidget::videoDriverChangedCall
- 		QApplication::postEvent(vw, new QTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
- 		playing = false;
- 		vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine,
--		                    vw->m_videoDriverName.ascii(), XINE_VISUAL_TYPE_X11,
-+		                    vw->m_videoDriverName.ascii(), XINE_VISUAL_TYPE_XCB,
- 		                    (void *) &(vw->m_x11Visual));
- 	}
- 	else
-@@ -1012,14 +1008,18 @@ void KXineWidget::fontForOSDMessagesChan
-  *      EVENT LOOP
-  *********************************************/
- 
--bool KXineWidget::x11Event(XEvent *event)
-+void KXineWidget::paintEvent(QPaintEvent *event)
- {
--	if (isXineReady())
--		if (event->type == Expose)
--			if (event->xexpose.count == 0)
--				xine_port_send_gui_data(m_videoDriver, XINE_GUI_SEND_EXPOSE_EVENT, event);
-+	if (isXineReady()) {
-+		xcb_expose_event_t xcb_event;
-+		memset(&xcb_event, 0, sizeof(xcb_event));
- 
--	return false;
-+		xcb_event.count = 0;
-+
-+		xine_port_send_gui_data(m_videoDriver, XINE_GUI_SEND_EXPOSE_EVENT, &xcb_event);
-+	}
-+
-+	QWidget::paintEvent(event);
- }
- 
- /**********************************************************
-@@ -1044,39 +1044,17 @@ bool KXineWidget::initXine()
- 
- 	/**** INIT XINE DISPLAY  ****/
- 
--	XInitThreads();
--
--	m_xineDisplay = XOpenDisplay( getenv("DISPLAY") );
-+	connection = xcb_connect(NULL, NULL);
- 
--	if (!m_xineDisplay)
-+	if (!connection)
- 	{
- 		emit signalXineFatal(i18n("Failed to connect to X-Server!"));
- 		return false;
- 	}
- 
--	int m_xineScreen = DefaultScreen(m_xineDisplay);
--	Window m_xineWindow = winId();
-+	int m_xineWindow = winId();
- 
--	/* determine display aspect ratio  */
--	double resHor = ((double) DisplayWidth(m_xineDisplay, m_xineScreen)) / DisplayWidthMM(m_xineDisplay, m_xineScreen);
--	double resVer = ((double) DisplayHeight(m_xineDisplay, m_xineScreen)) / DisplayHeightMM(m_xineDisplay, m_xineScreen);
--
--	m_displayRatio = resVer / resHor;
--
--#ifdef HAVE_XINERAMA
--	int dummy_event, dummy_error;
--
--	if (XineramaQueryExtension(m_xineDisplay, &dummy_event, &dummy_error))
--	{
--		int count = 1;
--		debugOut("Xinerama extension present");
--		XineramaQueryScreens(m_xineDisplay, &count);
--		debugOut(QString("%1 screens detected").arg(count));
--		if (count > 1)
--			/* multihead -> assuming square pixels */
--			m_displayRatio = 1.0;
--	}
--#endif
-+	m_displayRatio = 1.0;
- 
- 	debugOut(QString("Display aspect ratio (v/h): %1").arg(m_displayRatio));
- 
-@@ -1188,15 +1166,15 @@ bool KXineWidget::initXine()
- 	/* init video driver */
- 	debugOut("Init video driver");
- 
--	m_x11Visual.display          = m_xineDisplay;
--	m_x11Visual.screen           = m_xineScreen;
--	m_x11Visual.d                = m_xineWindow;
-+	m_x11Visual.connection       = connection;
-+	m_x11Visual.screen           = xcb_setup_roots_iterator(xcb_get_setup(connection)).data;
-+	m_x11Visual.window           = m_xineWindow;
- 	m_x11Visual.dest_size_cb     = &KXineWidget::destSizeCallback;
- 	m_x11Visual.frame_output_cb  = &KXineWidget::frameOutputCallback;
- 	m_x11Visual.user_data        = (void*)this;
- 
- 	m_videoDriver = xine_open_video_driver(m_xineEngine,
--	                                       m_videoDriverName.ascii(),  XINE_VISUAL_TYPE_X11,
-+	                                       m_videoDriverName.ascii(),  XINE_VISUAL_TYPE_XCB,
- 	                                       (void *) &(m_x11Visual));
- 
- 	if (!m_videoDriver && m_videoDriverName != "auto")
-@@ -1204,7 +1182,7 @@ bool KXineWidget::initXine()
- 		emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").arg(m_videoDriverName));
- 		m_videoDriverName = "auto";
- 		m_videoDriver = xine_open_video_driver(m_xineEngine,
--		                                       m_videoDriverName.ascii(),  XINE_VISUAL_TYPE_X11,
-+		                                       m_videoDriverName.ascii(), XINE_VISUAL_TYPE_XCB,
- 		                                       (void *) &(m_x11Visual));
- 	}
- 
-Index: kaffeine-0.8.3/kaffeine/src/player-parts/xine-part/kxinewidget.h
-===================================================================
---- kaffeine-0.8.3.orig/kaffeine/src/player-parts/xine-part/kxinewidget.h
-+++ kaffeine-0.8.3/kaffeine/src/player-parts/xine-part/kxinewidget.h
-@@ -48,7 +48,6 @@ class QTime;
- 
- #include <qtimer.h>
- #include <qptrlist.h>
--#include <X11/Xlib.h>
- #include <xine.h>
- 
- #ifndef USE_QT_ONLY
-@@ -57,6 +56,8 @@ class QTime;
- typedef int PostFilter; /* dummy type */
- #endif
- 
-+#include <xcb/xcb.h>
-+
- #define SUPPORTED_PROTOCOLS "file,http,mms,mmst,rtsp,rtp,tcp,pnm,cdda,vcd,vcdo,dvd,dvb,pvr,v4l,net,vdr,smb"
- 
- #define DEFAULT_TVTIME_CONFIG "tvtime:method=LinearBlend,enabled=1,pulldown=none,framerate_mode=half_top,judder_correction=0,use_progressive_frame_flag=1,chroma_filter=0,cheap_mode=1"
-@@ -308,7 +309,7 @@ protected:
- 	void initOSD();
- 
- private:
--	bool x11Event(XEvent *);
-+	void paintEvent(QPaintEvent *);
- 
- 	/********* callbacks and threads ************/
- 	static void destSizeCallback(void* p, int video_width, int video_height, double video_aspect,
-@@ -363,10 +364,10 @@ protected:
- 	QStringList m_videoDriverList;
- 
- 	/*x11*/
--	Display* m_xineDisplay;
-+	xcb_connection_t* connection;
- 
- 	/*xine*/
--	x11_visual_t m_x11Visual;
-+	xcb_visual_t m_x11Visual;
- 	xine_t* m_xineEngine;
- 	xine_audio_port_t* m_audioDriver;
- 	xine_video_port_t* m_videoDriver;
-Index: kaffeine-0.8.3/kaffeine/src/player-parts/xine-part/Makefile.am
-===================================================================
---- kaffeine-0.8.3.orig/kaffeine/src/player-parts/xine-part/Makefile.am
-+++ kaffeine-0.8.3/kaffeine/src/player-parts/xine-part/Makefile.am
-@@ -13,7 +13,7 @@ noinst_HEADERS =  xine_part_iface.h kxin
- libxinepart_la_SOURCES = xine_part.cpp kxinewidget.cpp postfilter.cpp deinterlacequality.cpp \
-                              videosettings.cpp filterdialog.cpp screenshotpreview.cpp xineconfig.cpp positionslider.cpp \
-                              equalizer.cpp xine_part_iface.skel
--libxinepart_la_LIBADD  = $(LIB_XINERAMA) $(LIB_XINE) ../kaffeine-part/libkaffeinepart.la
-+libxinepart_la_LIBADD  = $(LIB_XINERAMA) $(LIB_XINE) ../kaffeine-part/libkaffeinepart.la -lxcb
- libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined
- 
- 
diff --git a/media-video/kaffeine/files/kaffeine-with-xcb.patch b/media-video/kaffeine/files/kaffeine-with-xcb.patch
new file mode 100644
index 000000000000..56026eb82f32
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-with-xcb.patch
@@ -0,0 +1,27 @@
+--- kaffeine-0.8.4/configure.in.orig	2007-04-14 01:31:16.000000000 +0200
++++ kaffeine-0.8.4/configure.in	2007-04-14 01:38:39.000000000 +0200
+@@ -227,12 +227,15 @@
+ dnl check for xcb
+ dnl -------------
+ 
++AC_ARG_WITH([xcb], [AS_HELP_STRING([--without-xcb], [build without xcb support])],,
++  [with_xcb=yes])
++
+ AC_MSG_CHECKING([for xcb and xine-lib >= 1.1.5])
+ 
+ CFLAGS_XCB=""
+ LIB_XCB=""
+ 
+-if "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then
++if test "$with_xcb" != "no" && "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then
+ 	with_xcb=yes
+ 	CFLAGS_XCB=`"$PKG_CONFIG" --cflags xcb`
+ 	LIB_XCB=`"$PKG_CONFIG" --libs xcb`
+@@ -246,6 +249,7 @@
+ AC_SUBST([CFLAGS_XCB])
+ AC_SUBST([LIB_XCB])
+ 
++AM_CONDITIONAL([with_xcb], [test "$with_xcb" = "yes"])
+ dnl ---------------------
+ dnl check for DVB headers
+ dnl ---------------------
diff --git a/media-video/kaffeine/kaffeine-0.8.3-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.4.ebuild
index 0493d4e4fc2e..3f8db8a9effd 100644
--- a/media-video/kaffeine/kaffeine-0.8.3-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.3-r1.ebuild,v 1.1 2007/02/09 04:47:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.4.ebuild,v 1.1 2007/04/13 23:49:54 genstef Exp $
 
-inherit eutils kde flag-o-matic
+inherit eutils kde flag-o-matic autotools
 
 DESCRIPTION="Media player for KDE using xine and gstreamer backends."
 HOMEPAGE="http://kaffeine.sourceforge.net/"
@@ -15,10 +15,9 @@ IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility xcb"
 
 RDEPEND=">=media-libs/xine-lib-1
 	xcb? ( >=x11-libs/libxcb-1.0
-		>=media-libs/xine-lib-1.1.4-r1 )
-	gstreamer? ( =media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8*
-		=media-plugins/gst-plugins-xvideo-0.8* )
+		>=media-libs/xine-lib-1.1.5 )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+		=media-plugins/gst-plugins-xvideo-0.10* )
 	media-sound/cdparanoia
 	encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
@@ -27,8 +26,6 @@ RDEPEND=">=media-libs/xine-lib-1
 DEPEND="${RDEPEND}
 	dvb? ( media-tv/linuxtv-dvb-headers )"
 
-PATCHES="${FILESDIR}/${P}-build.patch"
-
 need-kde 3.5.4
 
 pkg_setup() {
@@ -43,8 +40,10 @@ pkg_setup() {
 
 src_unpack() {
 	kde_src_unpack
-
-	use xcb && epatch "${FILESDIR}/${P}-xcb.patch"
+	cd ${S}
+	# allow $(with_xcb)
+	epatch ${FILESDIR}/kaffeine-with-xcb.patch
+	eautoconf
 }
 
 src_compile() {
@@ -56,6 +55,7 @@ src_compile() {
 		$(use_with dvb)
 		$(use_with gstreamer)
 		$(use_with vorbis oggvorbis)
+		$(use_with xcb)
 		$(use_with encode lame)"
 
 	kde_src_compile