version bump

Package-Manager: portage-2.1.2.3

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 3aac2dd186a277045559fbea292cdc858a94367f..0cb5da3ccbf1e2a28de2df51397b7bc516452900 100644 (file)
--- 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/Manifest b/media-video/kaffeine/Manifest
index fed53048bb904b6bd7216bbfd3702327c85122a1..8a7db0bd1c4ab2f0b07a4b9359f4be3e1d97cf98 100644 (file)
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -18,28 +18,29 @@ AUX kaffeine-0.8.3-build.patch 403 RMD160 b92e966050ddcad80184d8c04c38af46f5825e
 MD5 dd8a01b726090b995a8b6a1e3931ee67 files/kaffeine-0.8.3-build.patch 403
 RMD160 b92e966050ddcad80184d8c04c38af46f5825e42 files/kaffeine-0.8.3-build.patch 403
 SHA256 8d7d657ad61a1cc5206174e3e3b81bb39331626a60d29970ff0db9cc69bef2e7 files/kaffeine-0.8.3-build.patch 403
-AUX kaffeine-0.8.3-xcb.patch 9407 RMD160 20f2608080ec8e6f4b7b2a5acc9ff241fbcf9367 SHA1 8c7ec07ab58911d1221b1dc761829da63e0c0521 SHA256 6b883026a8e3a64916be75236672014902c0a9d21a247c1ad6ed1e758826d66e
-MD5 f2b146d8dd5535cd4d1f9d38114b0ec1 files/kaffeine-0.8.3-xcb.patch 9407
-RMD160 20f2608080ec8e6f4b7b2a5acc9ff241fbcf9367 files/kaffeine-0.8.3-xcb.patch 9407
-SHA256 6b883026a8e3a64916be75236672014902c0a9d21a247c1ad6ed1e758826d66e files/kaffeine-0.8.3-xcb.patch 9407
+AUX kaffeine-with-xcb.patch 844 RMD160 799c57a4704d62430c65dcef1d9ffa22b63cb46f SHA1 afd8f700a1daa9416a926c0e9c230f8d9f8080ea SHA256 558abec653c48197b34033caf8a5711289ddae11516eefffd752210186b4cd2b
+MD5 d0a8ec57dae31ca92ec2431d61a0901d files/kaffeine-with-xcb.patch 844
+RMD160 799c57a4704d62430c65dcef1d9ffa22b63cb46f files/kaffeine-with-xcb.patch 844
+SHA256 558abec653c48197b34033caf8a5711289ddae11516eefffd752210186b4cd2b files/kaffeine-with-xcb.patch 844
 DIST kaffeine-0.7.1.tar.bz2 2276747 RMD160 b609bc47dd7cc11753c016bf0da3214f54fa8df0 SHA1 ae91768ca9f2542ba9c287371109ef9095146270 SHA256 7e2611ba4fb4cc5b6a1802250a5c404b22cca434ce1d3bbe83088f6189bfa145
 DIST kaffeine-0.8.3.tar.bz2 2940941 RMD160 f22a971481e8fd1a96063fef66d156d119c1e596 SHA1 6198ffe59422124855007a42443e2a69f6451e66 SHA256 42719f4eab6a27a06ec247369424f5a9d796fca74672573c467d024983a861b2
+DIST kaffeine-0.8.4.tar.bz2 2903979 RMD160 fd6a296a8e58a7a1165e91b0f8ced37fda968ffd SHA1 03d2a83d107f801b10c702f750bb95ad1bef344b SHA256 a15ad9f6b154ef1c83f3d0e818f94efd7ba6c2ae4e6affcc9d28afacb701df74
 EBUILD kaffeine-0.7.1-r2.ebuild 1251 RMD160 bf83871489cf398fee05cf74cdaeb35860b97362 SHA1 210f905a2528e1636a6dffe6e7717ba62a73e2ef SHA256 156e2b1cbcdd7132b50d40d15f869276caf3642f331482f2d3e552636e7f7326
 MD5 2b86f7aa8a3234ebe8b9780f38469e81 kaffeine-0.7.1-r2.ebuild 1251
 RMD160 bf83871489cf398fee05cf74cdaeb35860b97362 kaffeine-0.7.1-r2.ebuild 1251
 SHA256 156e2b1cbcdd7132b50d40d15f869276caf3642f331482f2d3e552636e7f7326 kaffeine-0.7.1-r2.ebuild 1251
-EBUILD kaffeine-0.8.3-r1.ebuild 1834 RMD160 93161479875233ca5cf0561a9a5ab4eda0dd53a7 SHA1 cb6e7ca9e8bcb566eb99e6d3cd5b0a4cd3b3552c SHA256 1d0215f233af3657aada5d15d4d6838a210b242346b9d5e65c931bf12a8e2c75
-MD5 3549cda251f017e67125e0ddb494728e kaffeine-0.8.3-r1.ebuild 1834
-RMD160 93161479875233ca5cf0561a9a5ab4eda0dd53a7 kaffeine-0.8.3-r1.ebuild 1834
-SHA256 1d0215f233af3657aada5d15d4d6838a210b242346b9d5e65c931bf12a8e2c75 kaffeine-0.8.3-r1.ebuild 1834
 EBUILD kaffeine-0.8.3.ebuild 1307 RMD160 cc7277496db19131c8cda0a1eda987fbb0ce46cd SHA1 67ceb622a9dafbfae58e9909a709c531bac01138 SHA256 a75902a5649749a61308cc0ca0451120f054b195cd5949d8c0414e18ee2057e0
 MD5 b2a8d9d81fae4e53112e2b7377f55caf kaffeine-0.8.3.ebuild 1307
 RMD160 cc7277496db19131c8cda0a1eda987fbb0ce46cd kaffeine-0.8.3.ebuild 1307
 SHA256 a75902a5649749a61308cc0ca0451120f054b195cd5949d8c0414e18ee2057e0 kaffeine-0.8.3.ebuild 1307
-MISC ChangeLog 11001 RMD160 f8bd11b4c490ea79b0cc61565d1d76392e5b6baa SHA1 7cd274bd5f9cb696a79ee5357796c5805331e9de SHA256 fe4068b380413f547737a9f9dce72fe031dde0e550805523915b56d897d6a043
-MD5 1fdea52d2d9c0aa073fd7b826fa49d98 ChangeLog 11001
-RMD160 f8bd11b4c490ea79b0cc61565d1d76392e5b6baa ChangeLog 11001
-SHA256 fe4068b380413f547737a9f9dce72fe031dde0e550805523915b56d897d6a043 ChangeLog 11001
+EBUILD kaffeine-0.8.4.ebuild 1821 RMD160 70cb7f50f0cbbe6a2991f4adceea867e5ba84a50 SHA1 bda89b949ee45cdc655b3379706084b44ca3c688 SHA256 906d00806be1e7ce53ce49f5a7d44d8e4f4b23e578062af44a5cb764e1a568b0
+MD5 ff21a2fb389b8227c69e3210ae7b2ee3 kaffeine-0.8.4.ebuild 1821
+RMD160 70cb7f50f0cbbe6a2991f4adceea867e5ba84a50 kaffeine-0.8.4.ebuild 1821
+SHA256 906d00806be1e7ce53ce49f5a7d44d8e4f4b23e578062af44a5cb764e1a568b0 kaffeine-0.8.4.ebuild 1821
+MISC ChangeLog 11223 RMD160 f5accec218b5632720ab19f8c4573e98a47eb5e8 SHA1 654188ab223ebcad3eb6617055c1f1f970ebe0a7 SHA256 ee0b9065305e772a11e96987a852cc3f4c80ae2308025f871143557cf4231bb2
+MD5 9ef0bf318179a1ceab07bbfe4c94ae8e ChangeLog 11223
+RMD160 f5accec218b5632720ab19f8c4573e98a47eb5e8 ChangeLog 11223
+SHA256 ee0b9065305e772a11e96987a852cc3f4c80ae2308025f871143557cf4231bb2 ChangeLog 11223
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
 MD5 80b81e0016b1f3cb6c95459a0e35fc87 metadata.xml 301
 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 metadata.xml 301
@@ -50,6 +51,6 @@ SHA256 be7cdc2892bb3974674212480a401b7a94746757df65e419657a4b117dc46676 files/di
 MD5 c9babd1fc7e4543b732e6b1ce64e50a5 files/digest-kaffeine-0.8.3 250
 RMD160 a82907e44a8880cae92c5c4ec5c66720e8df0521 files/digest-kaffeine-0.8.3 250
 SHA256 75a44f415295434b99fdcd723113cf61c8f7656b24574d1b4ae48987cba70879 files/digest-kaffeine-0.8.3 250
-MD5 c9babd1fc7e4543b732e6b1ce64e50a5 files/digest-kaffeine-0.8.3-r1 250
-RMD160 a82907e44a8880cae92c5c4ec5c66720e8df0521 files/digest-kaffeine-0.8.3-r1 250
-SHA256 75a44f415295434b99fdcd723113cf61c8f7656b24574d1b4ae48987cba70879 files/digest-kaffeine-0.8.3-r1 250
+MD5 f4d0eb15e550866a241038bce975167e files/digest-kaffeine-0.8.4 250
+RMD160 4def00c9cfe74c87ab91923c4e616057e866a06d files/digest-kaffeine-0.8.4 250
+SHA256 478b87d03060bd77675f81e97babe56ce00e9368743bb4d889eca9722a2b4e90 files/digest-kaffeine-0.8.4 250

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 (file)
index 04b39d4..0000000
--- 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 (file)
index 0000000..34db598
--- /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 (file)
index babe90b..0000000
--- 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 (file)
index 0000000..56026eb
--- /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
similarity index 82%
rename from media-video/kaffeine/kaffeine-0.8.3-r1.ebuild
rename to media-video/kaffeine/kaffeine-0.8.4.ebuild
index 0493d4e4fc2e3e4c7a5df03dd5fd60d4a513c001..3f8db8a9effdfef408e1ae35243a49bbf7d094fd 100644 (file)
--- 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