From 7f03ef2dc20a393dcbf3868e06c1da393771ca89 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Mon, 31 Oct 2011 18:21:09 -0300 Subject: xorg-server update --- extra/colord/PKGBUILD | 2 +- extra/libtheora/PKGBUILD | 2 +- extra/mesa/PKGBUILD | 7 ++++++- extra/pixman/PKGBUILD | 8 +++---- extra/xf86-video-fbdev/PKGBUILD | 2 +- extra/xf86-video-siliconmotion/PKGBUILD | 6 ++++-- extra/xorg-server/PKGBUILD | 37 +++++++++++++++++++++++++++++++-- 7 files changed, 52 insertions(+), 12 deletions(-) diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index fc4ff867e..fa7c0c9d3 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -6,7 +6,7 @@ pkgname=colord pkgver=0.1.13 pkgrel=1 pkgdesc="Color daemon" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" license=('GPL2') depends=('lcms2' 'sqlite3' 'polkit' 'udev' 'sane') diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD index 804fce211..d40c8a8d0 100644 --- a/extra/libtheora/PKGBUILD +++ b/extra/libtheora/PKGBUILD @@ -18,7 +18,7 @@ sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') build() { cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static + ./configure --prefix=/usr --enable-shared --disable-static --build=$CHOST --target=$CHOST --host=$CHOST make } diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index f086e8c58..f467752b0 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -186,7 +186,8 @@ package_libegl() { } package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') +[ "$CARCH" = "mips64el" ] || depends+=('dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" @@ -315,3 +316,7 @@ package_nouveau-dri() { # make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install #fi #} +md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + 'ff03aca82d0560009a076a87c888cf13' + 'c7788f2495060bf133771aef6ad25929' + '598c24dccfcdcc99c07d883f7c09f36a') diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 0271c3942..77f6ab156 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -18,10 +18,10 @@ sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3' build() { cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" = "mips64el" ] && { - patch -Np1 -i $srcdir/pixman-loongson2f.patch - autoreconf -i - } +# [ "$CARCH" = "mips64el" ] && { +# patch -Np1 -i $srcdir/pixman-loongson2f.patch +# autoreconf -i +# } ./configure --prefix=/usr --disable-static make } diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index 6b1f05cfe..fd626bdb8 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -3,7 +3,7 @@ pkgname=xf86-video-fbdev pkgver=0.4.2 -pkgrel=5 +pkgrel=6 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64 'mips64el') license=('custom') diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD index 09da32575..e2e588c5c 100644 --- a/extra/xf86-video-siliconmotion/PKGBUILD +++ b/extra/xf86-video-siliconmotion/PKGBUILD @@ -4,7 +4,7 @@ pkgname=xf86-video-siliconmotion pkgver=1.7.5 -pkgrel=3 +pkgrel=5 pkgdesc="X.org siliconmotion video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -21,7 +21,7 @@ sha1sums=('946acae0822d51da57abe8b7ed049691bd731589' build() { cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff + [ "$CARCH" = "mips64el" ] && patch -Np1 -i ${srcdir}/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install @@ -29,3 +29,5 @@ build() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } +sha1sums=('946acae0822d51da57abe8b7ed049691bd731589' + 'b3cc8e8aaaabdf25857b781d6793c70815003f9b') diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 94ee20a94..519a39078 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -8,7 +8,8 @@ pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto') +[ "$CARCH" = "mips64el" ] || makedepends+=('xf86driproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch @@ -43,6 +44,34 @@ build() { patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi + if [ "$CARCH" = "mips64el" ]; then + ./configure --prefix=/usr \ + --enable-ipv6 \ + --disable-dri \ + --disable-dri2 \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-composite \ + --enable-xcsecurity \ + --enable-xorg \ + --enable-xephyr \ + --disable-glx \ + --disable-glx-tls \ + --enable-kdrive \ + --enable-install-setuid \ + --enable-config-udev \ + --disable-config-dbus \ + --enable-record \ + --disable-xfbdev \ + --disable-xfake \ + --disable-static \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-fontrootdir=/usr/share/fonts + else ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ @@ -67,6 +96,7 @@ build() { --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --with-fontrootdir=/usr/share/fonts + fi make # Disable subdirs for make install rule to make splitting easier @@ -110,9 +140,11 @@ package_xorg-server() { rmdir "${pkgdir}/usr/share/X11" + if [ "$CARCH" != "mips64el" ]; then # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" + fi rm -rf "${pkgdir}/var" @@ -176,7 +208,8 @@ package_xorg-server-xdmx() { package_xorg-server-devel() { pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto xineramaproto xorg-util-macros pixman libpciaccess) +[ "$CARCH" = "mips64el" ] || depends+=('dri2proto') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install -- cgit v1.2.3-54-g00ecf