summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-21 14:29:11 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-21 14:29:11 -0300
commitfe0996f2e8716b772785a0bf93c6a3f2d5dc22ff (patch)
tree2ee658b20ace2ab8fff6035e6a0e223b8d70f1eb /extra
parent9d9dd0f9452c6a9d533ce805b903aea596aff108 (diff)
Rebuilds
Diffstat (limited to 'extra')
-rw-r--r--extra/mesa/PKGBUILD8
-rw-r--r--extra/pixman/PKGBUILD2
-rw-r--r--extra/poppler/PKGBUILD4
3 files changed, 8 insertions, 6 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index c894476b5..9689c7c03 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -47,7 +47,13 @@ if [ "$CARCH" = "mips64el" ]; then
patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch
patch -Np1 -i $srcdir/mesa-loongson.patch
- ./configure --prefix=/usr \
+ configure=configure
+ if [ ! -f configure ]; then
+ autoreconf -vfi
+ configure=autogen.sh
+ fi
+
+ ./${configure} --prefix=/usr \
--enable-glx-tls \
--with-driver=xlib \
--enable-xcb \
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index da71f5bfc..5ee65c636 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -13,7 +13,7 @@ depends=('glibc')
options=('!libtool')
source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
pixman-loongson2f.patch)
-sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177'
'ce4d69ea341f21fdc30f6d401ee479cd3571dab3')
build() {
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 234825d30..7c57b8c27 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -20,14 +20,10 @@ md5sums=('d30e883a27423c936ef338ce1d967e2d'
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
-<<<<<<< HEAD
- patch -Np1 -i "${srcdir}/fix_cairo.patch"
-=======
sed -i -e '/AC_PATH_XTRA/d' configure.ac
patch -Np1 -i "${srcdir}/git-fixes.patch"
autoreconf -fi
->>>>>>> 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \