Sync with latest changes in master

13 files changed, 42 insertions, 21 deletions

diff --git a/display/directfb/BUILD b/display/directfb/BUILD
index 3db6c551f2..01d5fa789e 100755
--- a/display/directfb/BUILD
+++ b/display/directfb/BUILD
@@ -1,5 +1,6 @@
 OPTS="--with-inputdrivers=$inputdrivers         \
       --with-gfxdrivers=$gfxdrivers             \
+      --disable-vnc                             \
       $DFB_DEBUG $DFB_NETWORK $DFB_VOODOO       \
       $DFB_UNIQUE $DFB_V4L $DFB_V4L2 $DFB_TESTS \
       $OPTS"                                    &&
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index e5f14d4f75..b79e855e44 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -21,7 +21,7 @@ optional_depends  libpng            \
                   '--disable-png'   \
                   'for PNG images'  &&
 
-optional_depends  LIBGIF            \
+optional_depends  giflib            \
                   '--enable-gif'    \
                   '--disable-gif'   \
                   'for GIF images'  &&
@@ -59,9 +59,4 @@ optional_depends  gpm                                  \
 optional_depends  sysfsutils                      \
                   '--enable-sysfs'                \
                   '--disable-sysfs'               \
-                  'for Linux 2.6+ SysFS support'  &&
-
-optional_depends  libvncserver                    \
-                  '--enable-vnc'                  \
-                  '--disable-vnc'                 \
-                  'for vnc support'
+                  'for Linux 2.6+ SysFS support'
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index d1f8200cdd..3064b24790 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,14 @@
+2008-07-13 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Removed libvncserver, fails to build here
+	* BUILD: Disable VNC, fails to build here
+
+2008-07-12 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: depends on giflib, provider deprecated
+
+2008-04-15 Ethan Grammatikidis <eekee57@fastmail.fm>
+	* gfxdrivers: New drivers
+	* inputdrivers: New drivers
+
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
diff --git a/display/directfb/gfxdrivers b/display/directfb/gfxdrivers
index 0f49b5022b..ba7f29d54f 100644
--- a/display/directfb/gfxdrivers
+++ b/display/directfb/gfxdrivers
@@ -1,6 +1,7 @@
 ati128		ATI Rage 128
 cle266		VIA CLE266
 cyber5k		TVIA CyberPro
+davinci		TI Davinci
 i810		Intel i810
 i830		Intel i830
 mach64		ATI Mach64
@@ -8,8 +9,11 @@ matrox		Matrox
 neomagic	NeoMagic
 nsc			NSC Geode
 nvidia		nVidia RIVA TNT
+omap		TI OMAP
 radeon		ATI Radeon r100/r200/r300+
 savage		S3 Savage
+sh7722		Renesas SH7722
 sis315		SiS 315
 tdfx		3Dfx Voodoo
 unichrome	Unichrome
+vmware		VMWare
diff --git a/display/directfb/inputdrivers b/display/directfb/inputdrivers
index 79b7ec2a3f..8cee208669 100644
--- a/display/directfb/inputdrivers
+++ b/display/directfb/inputdrivers
@@ -1,16 +1,18 @@
-dbox2remote		Dreambox2 remote
-dreamboxremote		Dreambox remote
+dbox2remote	Dreambox2 remote
+dreamboxremote	Dreambox remote
 dynapro		?
-elo-input		?
+elo-input	?
 gunze		?
-h3600_ts		?
-joystick		Joystick
-keyboard		Keyboard
-linuxinput		Linux input
+h3600_ts	?
+joystick	Joystick
+keyboard	Keyboard
+linuxinput	Linux input
 lirc		Lirc infra-red
 mutouch		Mutouch touch-screen
 penmount	?
-ps2mouse		PS/2 mouse
-serialmouse		Serial mouse
-sonypijogdial		Sony jog dial
+ps2mouse	PS/2 mouse
+serialmouse	Serial mouse
+sonypijogdial	Sony jog dial
+tslib		?
+ucb1x00_ts	?
 wm97xx		WM97xx touch-screen
diff --git a/display/fbv/DEPENDS b/display/fbv/DEPENDS
index 38fea499e7..cc7ab27bbd 100755
--- a/display/fbv/DEPENDS
+++ b/display/fbv/DEPENDS
@@ -1,3 +1,3 @@
-depends  libungif  &&
+depends  giflib    &&
 depends  libpng    &&
 depends  jpeg
diff --git a/display/fbv/HISTORY b/display/fbv/HISTORY
index 1e11a0eae1..f888922c01 100644
--- a/display/fbv/HISTORY
+++ b/display/fbv/HISTORY
@@ -1,3 +1,6 @@
+2008-07-12 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: depends on giflib, libungif deprecated
+
 2006-06-28 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
@@ -17,4 +20,3 @@
 	* BUILD, DETAILS, DEPENDS: Cleanup.
 	* BUILD: Link with libz and libm (bug #6600)
 	* HISTORY: Added.
-
diff --git a/display/fresco/DETAILS b/display/fresco/DETAILS
index 145fa1bb2e..571bf898ae 100755
--- a/display/fresco/DETAILS
+++ b/display/fresco/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Fresco-${VERSION}
    SOURCE_URL[0]=http://download.fresco.org/releases/${VERSION}/src/${SOURCE}
      SOURCE_HASH=sha512:0b3a6874645ecdbde85f3fd709d602b95f01b2aa6feaa6bbdf95f0fd43f1cf2c999b7281eafe0d6664860e28111941236d688e6ab79ee32852f762a89ba3e8e5
 fi
-        WEB_SITE=http://www2.fresco.org/index.html
+        WEB_SITE=http://www.fresco.org/
          ENTERED=20030915
       LICENSE[0]=LGPL
         KEYWORDS="display"
diff --git a/display/fresco/HISTORY b/display/fresco/HISTORY
index fcd05f96a6..3d9cc42e69 100644
--- a/display/fresco/HISTORY
+++ b/display/fresco/HISTORY
@@ -1,3 +1,6 @@
+2008-04-15 Ethan Grammatikidis <eekee57@fastmail.fm>
+	* DETAILS: Fixed WEB_SITE
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/display/qingy/DETAILS b/display/qingy/DETAILS
index dd10ebffb6..f95fe59f23 100755
--- a/display/qingy/DETAILS
+++ b/display/qingy/DETAILS
@@ -1,5 +1,5 @@
            SPELL=qingy
-         VERSION=0.9.6
+         VERSION=0.9.7
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index 0de653fff6..ee7c4a2e39 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,6 @@
+2008-07-13 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 0.9.7
+
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
diff --git a/display/qingy/qingy-0.9.6.tar.bz2.sig b/display/qingy/qingy-0.9.6.tar.bz2.sig
deleted file mode 100644
index e9eb24c574..0000000000
--- a/display/qingy/qingy-0.9.6.tar.bz2.sig
+++ /dev/null
diff --git a/display/qingy/qingy-0.9.7.tar.bz2.sig b/display/qingy/qingy-0.9.7.tar.bz2.sig
new file mode 100644
index 0000000000..88d6686f6a
--- /dev/null
+++ b/display/qingy/qingy-0.9.7.tar.bz2.sig