xorg-server: add metafile support, thanks to cowbalt

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/x11/xserver/xorg-server/build

@@ -6,34 +6,7 @@ XORG_SRC="$PKG_BUILD/hw/xfree86"
 
 get_graphicdrivers
 
-$SCRIPTS/build toolchain
-
-$SCRIPTS/build util-macros
-$SCRIPTS/build font-util
-$SCRIPTS/build fontsproto
-$SCRIPTS/build randrproto
-$SCRIPTS/build renderproto
-$SCRIPTS/build scrnsaverproto
-$SCRIPTS/build videoproto
-$SCRIPTS/build inputproto
-$SCRIPTS/build xf86dgaproto
-$SCRIPTS/build xf86driproto
-$SCRIPTS/build xf86miscproto
-$SCRIPTS/build glproto
-$SCRIPTS/build libpciaccess
-$SCRIPTS/build libX11
-$SCRIPTS/build libXfont
-$SCRIPTS/build libxkbfile
-$SCRIPTS/build libdrm
-$SCRIPTS/build Mesa-GL
-$SCRIPTS/build openssl
-$SCRIPTS/build freetype
-$SCRIPTS/build pixman
-$SCRIPTS/build fontsproto
-$SCRIPTS/build udev
-
 if [ "$XINERAMA_SUPPORT" = "yes" ]; then
-  $SCRIPTS/build libXinerama
   XORG_XINERAMA="--enable-xinerama"
 else
   XORG_XINERAMA="--disable-xinerama"

packages/x11/xserver/xorg-server/install

@@ -4,18 +4,6 @@
 
 get_graphicdrivers
 
-$SCRIPTS/install libpciaccess
-$SCRIPTS/install freetype
-$SCRIPTS/install openssl
-$SCRIPTS/install libX11
-$SCRIPTS/install libXfont
-$SCRIPTS/install libdrm
-$SCRIPTS/install Mesa
-$SCRIPTS/install pixman
-$SCRIPTS/install udev
-
-[ "$XINERAMA_SUPPORT" = "yes" ] && $SCRIPTS/install libXinerama
-
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"
 
@@ -54,30 +42,6 @@ mkdir -p $INSTALL/usr/lib/xorg
 mkdir -p $INSTALL/usr/share/X11/xorg.conf.d
   cp $PKG_BUILD/config/10-evdev.conf $INSTALL/usr/share/X11/xorg.conf.d
 
-#Fonts
-  $SCRIPTS/install encodings
-  $SCRIPTS/install font-xfree86-type1
-  $SCRIPTS/install font-bitstream-type1
-  $SCRIPTS/install font-misc-misc
-
-#Server
-  $SCRIPTS/install xkeyboard-config
-  $SCRIPTS/install xkbcomp
-
-#Drivers
-  $SCRIPTS/install xf86-input-evdev
-#  $SCRIPTS/install xf86-input-synaptics
-#  $SCRIPTS/install xf86-input-wacom
-
-  for drv in $XORG_DRIVERS; do
-    $SCRIPTS/install xf86-video-$drv
-  done
-
-# Tools
-  $SCRIPTS/install pciutils
-  $SCRIPTS/install ratpoison
-  $SCRIPTS/install xrandr
-
 if [ "$DEVTOOLS" = yes ]; then
   cp $XORG_SRC/utils/cvt/cvt $INSTALL/usr/bin
   cp $XORG_SRC/utils/gtf/gtf $INSTALL/usr/bin

packages/x11/xserver/xorg-server/meta

@@ -0,0 +1,36 @@
+PKG_NAME="xorg-server"
+PKG_VERSION="1.9.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libpciaccess freetype openssl libX11 libXfont libdrm Mesa pixman udev"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa-GL openssl freetype pixman fontsproto udev"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/xserver"
+PKG_SHORTDESC="xorg-server: The Xorg X server"
+PKG_LONGDESC="Xorg is a full featured X server that was originally designed for UNIX and UNIX-like operating systems running on Intel x86 hardware."
+PKG_IS_ADDON="no"
+
+if [ "$XINERAMA_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS libXinerama"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXinerama"
+fi
+
+# Additional packages we need for using xorg-server:
+# Fonts
+  PKG_DEPENDS="$PKG_DEPENDS encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"
+
+# Server
+  PKG_DEPENDS="$PKG_DEPENDS xkeyboard-config xkbcomp"
+
+# Drivers
+  PKG_DEPENDS="$PKG_DEPENDS xf86-input-evdev" # xf86-input-synaptics xf86-input-wacom
+
+  for drv in $XORG_DRIVERS; do
+    PKG_DEPENDS="$PKG_DEPENDS xf86-video-$drv"
+  done
+
+# Tools
+  PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr"

packages/x11/xserver/xorg-server/url

@@ -1 +0,0 @@
-http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.9.2.tar.bz2