diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 6f1655484f..c1a79ae39d 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/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" diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index d4b352685c..768fb4ad6e 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/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 diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta new file mode 100644 index 0000000000..3b4b6aa82d --- /dev/null +++ b/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" diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.8.2-pkg_config.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-05_pkg_config.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.8.2-pkg_config.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-05_pkg_config.patch diff --git a/packages/x11/xserver/xorg-server/patches/cache-xkbcomp-output-for-fast-start-up.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-10_cache_xkbcomp_output_for_fast_start_up.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/cache-xkbcomp-output-for-fast-start-up.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-10_cache_xkbcomp_output_for_fast_start_up.patch diff --git a/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-11_use_sloppy_heuristic_first_for_initial_mode.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-11_use_sloppy_heuristic_first_for_initial_mode.patch diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.6.1-nouveau.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-12_nouveau.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-1.6.1-nouveau.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-12_nouveau.patch diff --git a/packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-20_extra_modelines_fromxorg.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-20_extra_modelines_fromxorg.patch diff --git a/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-21_x11_nonroot-vesa.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-21_x11_nonroot-vesa.patch diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-22_bg_none_root.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-22_bg_none_root.patch diff --git a/packages/x11/xserver/xorg-server/patches/do-not-zap-xserver.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-22_do_not_zap_xserver.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/do-not-zap-xserver.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-22_do_not_zap_xserver.patch diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.diff b/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-25_less_acpi_brokenness.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.diff rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.9.2-25_less_acpi_brokenness.patch diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url deleted file mode 100644 index 14160a1005..0000000000 --- a/packages/x11/xserver/xorg-server/url +++ /dev/null @@ -1 +0,0 @@ -http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.9.2.tar.bz2 \ No newline at end of file