--- ./svn/libs/libmythtv/videoout_directfb.cpp  2007-07-25 11:32:59.000000000 +0000
+++ ./patched/libs/libmythtv/videoout_directfb.cpp      2007-07-25 11:38:15.000000000 +0000
@@ -118,7 +118,9 @@ static const unsigned int QT_KEYS[DIKI_N
         {0x1021,0x00},  // Control Right
         {0x1023,0x00},  // ALT Left
         {0x1023,0x00},  // ALT Right
+#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 23)
         {0xffff,0x00}, // DIKS_ALTGR  not sure what QT Key is
+#endif
         {0x1022,0x00},  // META Left
         {0x1022,0x00},  // META Right
         {0x1053,0x00}, // Super Left
@@ -212,7 +214,7 @@ class DirectfbData
         bzero(&videoLayerDesc,           sizeof(DFBDisplayLayerDescription));
         bzero(&videoLayerConfig,         sizeof(DFBDisplayLayerConfig));
         bzero(&videoSurfaceCapabilities, sizeof(DFBSurfaceCapabilities));
-#if (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
+#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
         bzero(&cardCapabilities, sizeof(DFBCardCapabilities));
 #else
         bzero(&cardDescription,  sizeof(DFBGraphicsDeviceDescription));
@@ -235,7 +237,7 @@ class DirectfbData
     DFBSurfaceCapabilities       videoSurfaceCapabilities;

     //video output
-#if (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
+#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
     DFBCardCapabilities          cardCapabilities;
 #else
     DFBGraphicsDeviceDescription cardDescription;
@@ -373,7 +375,7 @@ bool VideoOutputDirectfb::Init(int width


     //determine output card capacities
-#if (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
+#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
     DFBCHECKFAIL(data->dfb->GetCardCapabilities(data->dfb, &(data->cardCapabilities)), false);
     VERBOSE(VB_PLAYBACK, QString("DirectFB output : card : %1")
             .arg((data->cardCapabilities.acceleration_mask & DFXL_BLIT) > 0 ?
@@ -388,7 +390,7 @@ bool VideoOutputDirectfb::Init(int width
     //clear primary layer
     desc.flags = DSDESC_CAPS;
     desc.caps = DSCAPS_PRIMARY;
-#if (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
+#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
     if (data->cardCapabilities.acceleration_mask & DFXL_BLIT)
 #else
     if (data->cardDescription.acceleration_mask & DFXL_BLIT)
@@ -531,7 +533,7 @@ void VideoOutputDirectfb::PrepareFrame(V

     if (!bufferSurface)
         return;
-#if (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
+#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION <= 9) && (DIRECTFB_MICRO_VERSION <= 22)
     if ((data->cardCapabilities.acceleration_mask & DFXL_BLIT) > 0)
 #else
     if ((data->cardDescription.acceleration_mask & DFXL_BLIT) > 0)