From a0b49296dfc1fccd76eab199faad82e5861a953b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 22 Oct 2012 15:17:29 +0200 Subject: [PATCH] xorg-server: update to xorg-server-1.13.0 Signed-off-by: Stephan Raue --- packages/x11/xserver/xorg-server/build | 2 +- packages/x11/xserver/xorg-server/install | 9 --------- packages/x11/xserver/xorg-server/meta | 2 +- ...nfig.patch => xorg-server-1.13.0-05_pkg_config.patch} | 0 ...n.patch => xorg-server-1.13.0-14-detect_radeon.patch} | 0 ...xorg-server-1.13.0-20_extra_modelines_fromxorg.patch} | 0 ...s.patch => xorg-server-1.13.0-81-compile_fixes.patch} | 0 7 files changed, 2 insertions(+), 11 deletions(-) rename packages/x11/xserver/xorg-server/patches/{xorg-server-1.12.4-05_pkg_config.patch => xorg-server-1.13.0-05_pkg_config.patch} (100%) rename packages/x11/xserver/xorg-server/patches/{xorg-server-1.12.4-14-detect_radeon.patch => xorg-server-1.13.0-14-detect_radeon.patch} (100%) rename packages/x11/xserver/xorg-server/patches/{xorg-server-1.12.4-20_extra_modelines_fromxorg.patch => xorg-server-1.13.0-20_extra_modelines_fromxorg.patch} (100%) rename packages/x11/xserver/xorg-server/patches/{xorg-server-1.12.4-81-compile_fixes.patch => xorg-server-1.13.0-81-compile_fixes.patch} (100%) diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 152c9da6d6..44cbcacfeb 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -91,10 +91,10 @@ cd $PKG_BUILD --disable-xf86bigfont \ --enable-dpms \ --enable-config-udev \ + --enable-config-udev-kms \ --disable-config-dbus \ --disable-config-hal \ --enable-xfree86-utils \ - --enable-xaa \ --enable-vgahw \ --enable-vbe \ --enable-int10-module \ diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index db5d7c1354..6c0ec6078c 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -43,17 +43,8 @@ mkdir -p $XORG_DST cp -P $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST cp -P $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST cp -P $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST - cp -P $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST mkdir -p $XORG_DST/extensions - cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions - cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions - cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions - cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions - - if [ -f $XORG_SRC/dri/.libs/libdri.so ]; then - cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions - fi if [ -f $XORG_SRC/dixmods/.libs/libglx.so ]; then cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta index d29efb713e..e322649f48 100644 --- a/packages/x11/xserver/xorg-server/meta +++ b/packages/x11/xserver/xorg-server/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xorg-server" -PKG_VERSION="1.12.4" +PKG_VERSION="1.13.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-05_pkg_config.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-05_pkg_config.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-05_pkg_config.patch rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-05_pkg_config.patch diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-14-detect_radeon.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-14-detect_radeon.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-14-detect_radeon.patch rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-14-detect_radeon.patch diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-20_extra_modelines_fromxorg.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-20_extra_modelines_fromxorg.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-20_extra_modelines_fromxorg.patch rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-20_extra_modelines_fromxorg.patch diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-81-compile_fixes.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-81-compile_fixes.patch similarity index 100% rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.12.4-81-compile_fixes.patch rename to packages/x11/xserver/xorg-server/patches/xorg-server-1.13.0-81-compile_fixes.patch