From fe4dcf73c98bd9629ed703a027a4b812fb174cdd Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Thu, 10 Nov 2011 15:17:02 -0300 Subject: Updates --- community/libdnet/PKGBUILD | 3 +- community/lmms/PKGBUILD | 2 +- core/mkinitcpio-busybox/PKGBUILD | 2 +- core/mkinitcpio/PKGBUILD | 11 ++++---- core/mkinitcpio/patch.patch | 15 +++++++--- core/openssl/PKGBUILD | 34 ++++++++++++++++++----- extra/avahi/PKGBUILD | 2 +- extra/cups/PKGBUILD | 2 +- extra/fftw/PKGBUILD | 10 +++++-- extra/mesa/PKGBUILD | 4 +++ libre/linux-libre/PKGBUILD | 52 +++++++++++++++++++++++++++++++++-- libre/linux-libre/linux-libre.install | 2 +- social/ffingerd/PKGBUILD | 2 +- social/liblockfile/PKGBUILD | 9 +++--- social/libowfat/PKGBUILD | 2 +- social/lockfile-progs/PKGBUILD | 6 ++-- social/opentracker/PKGBUILD | 6 ++-- 17 files changed, 126 insertions(+), 38 deletions(-) diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index cb3d793a0..819d9fb90 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -20,9 +20,10 @@ build() { mkdir -p $pkgdir/usr/bin [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC + [ $CARCH == "mips64el" ] && export CFLAGS+=-fPIC cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --target=${CHOST} --host=${CHOST} --build=${CHOST} make && make DESTDIR=$pkgdir install cd python && \ diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index c1827d8ab..fc9280f91 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -16,7 +16,7 @@ optdepends=('wine: VST support (experimental)' 'stk: STK instruments plugins' 'pulseaudio: PulseAudio output') makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk') -[ $CARCH = i686 ] && makedepends+=('wine') +[[ $CARCH = i686 ]] && makedepends+=('wine') provides=('lmms-extras') conflicts=('lmms-extras') options=('!libtool' '!makeflags') diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 9c03696d4..e17c3f9cf 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -21,7 +21,7 @@ build() { case $CARCH in mips64el) - local safeflags='-O2 -march=loongson2f -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;; + local safeflags='loongson2f -O2 -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;; *) local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;; esac diff --git a/core/mkinitcpio/PKGBUILD b/core/mkinitcpio/PKGBUILD index 49ca6284c..faed61e50 100644 --- a/core/mkinitcpio/PKGBUILD +++ b/core/mkinitcpio/PKGBUILD @@ -1,13 +1,12 @@ pkgname=mkinitcpio -pkgver=0.7.4 +pkgver=0.7.5 pkgrel=1 -epoch=14 pkgdesc="Modular initramfs image creation utility" arch=('mips64el') url="http://www.archlinux.org/" license=('GPL') depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' - 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=171-2' 'file' 'gzip') + 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' @@ -17,7 +16,7 @@ replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'patch.patch') backup=(etc/mkinitcpio.conf) -sha256sums=('60ce2c78ecec35a9762c300774753da6870b4469f3b259fe0c116771ff643fd6' +sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9' 'abf6bb9d692838cc2f97f12f0901f0209dbf6f437f9590accd26dbcfc48f1b16') package() { @@ -26,4 +25,6 @@ package() { patch install/base ../patch.patch make DESTDIR="$pkgdir" install -} \ No newline at end of file +} +sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9' + 'bb6517e0497cc43aea1287e43b0be2892b7af74add5eca3f3740b091f997729e') diff --git a/core/mkinitcpio/patch.patch b/core/mkinitcpio/patch.patch index ce3553557..62dadac32 100644 --- a/core/mkinitcpio/patch.patch +++ b/core/mkinitcpio/patch.patch @@ -1,4 +1,11 @@ -4c4 -< for dir in proc sys dev run usr/{bin,sbin}; do ---- -> for dir in lib32 proc sys dev run usr/{bin,sbin}; do # Added `lib32' like fauno told me to. +--- install/base 2011-10-22 12:37:45.000000000 -0300 ++++ install/base.orig 2011-11-03 19:54:45.574991740 -0300 +@@ -1,7 +1,7 @@ + #!/bin/bash + + build() { +- for dir in new_root proc sys dev run usr/{bin,sbin}; do ++ for dir in new_root proc sys dev run usr/{bin,sbin} lib32; do + add_dir "/$dir" + done + diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index a0237888d..e5c5da68a 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -17,24 +17,23 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' + 'gnu-linux-mips64el-gcc.patch' 'ca-dir.patch') md5sums=('7040b89c4c58c7a1016c0dfa6e821c86' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' + 'd7115f0cc44df346d7b68c681819f94b' '3bf51be3a1bbd262be46dc619f92aa90') +[ "$CARCH" = "mips64el" ] && \ +makedepends=('imake') + # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$_ver - if [ "${CARCH}" == 'x86_64' ]; then - openssltarget='linux-x86_64' - elif [ "${CARCH}" == 'i686' ]; then - openssltarget='linux-elf' - fi - # avoid conflicts with other man pages # see http://www.linuxfromscratch.org/patches/downloads/openssl/ patch -p1 -i $srcdir/fix-manpages.patch @@ -42,11 +41,32 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch + + patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch + + case "${CARCH}" in + 'x86_64') + openssltarget='linux-x86_64' ;; + 'i686') + openssltarget='linux-elf' ;; + 'mips64el') +# ./config + openssltarget='gnu-linux-mips64el-gcc' ;; + # openssltarget='linux-generic32' ;; + esac + # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + if [ "$CARCH" = "mips64el" ]; then + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ + shared zlib enable-md2 \ + "${openssltarget}" -Wa,--noexecstack "${CFLAGS}" + else ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 \ "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + + fi make depend make diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 72a021dd1..d1af94444 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.30 -pkgrel=5.1 +pkgrel=5.2 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64' 'mips64el') url='http://www.avahi.org/' diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index ba3430d87..414cb2802 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -4,7 +4,7 @@ pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.5.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index d6d2555f2..703227633 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -32,20 +32,24 @@ build() { CONFIGURE="./configure F77=gfortran --prefix=/usr \ --enable-shared --enable-threads" - # build & install double precision + if [ "$CARCH" != "mips64el" ]; then + msg "Build & install double precision" $CONFIGURE --enable-sse2 make make DESTDIR=${pkgdir} install make clean + fi - # build & install long double precission + msg "build & install long double precission" $CONFIGURE --enable-long-double make make DESTDIR=${pkgdir} install make clean - # build & install single precision + if [ "$CARCH" != "mips64el" ]; then + msg "build & install single precision" $CONFIGURE --enable-float --enable-sse make make DESTDIR=${pkgdir} install + fi } diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index f6c2ad38d..c894476b5 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -316,3 +316,7 @@ package_nouveau-dri() { # make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install #fi #} +md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + '774eb6f30b31fa08c04e16e00ca070e1' + 'c7788f2495060bf133771aef6ad25929' + '598c24dccfcdcc99c07d883f7c09f36a') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 123c463d4..efce423c7 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -26,7 +26,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'Kbuild' 'Kbuild.platforms' 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'i915-fix-ghost-tv-output.patch' + 'i915-fix-incorrect-error-message.patch' + 'iwlagn-fix-NULL-pointer-dereference.patch' + 'dib0700-fix.patch' + 'usb-add-reset-resume-quirk-for-several-webcams.patch') build() { cd "${srcdir}/linux-${_basekernel}" @@ -36,6 +41,35 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # Some chips detect a ghost TV output + # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html + # Arch Linux bug report: FS#19234 + # + # It is unclear why this patch wasn't merged upstream, it was accepted, + # then dropped because the reasoning was unclear. However, it is clearly + # needed. + patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + + # In 3.1.0, a DRM_DEBUG message is falsely declared as DRM_ERROR. This + # worries users, as this message is displayed even at loglevel 4. Fix + # this. + patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch" + + # iwlagn has a critical bug that hangs the system on 3.1.0. A patch + # was posted, but didn't make it into the tree in time. + # http://marc.info/?l=linux-wireless&m=131840748927629&w=2 + # FS#26674 + patch -Np1 -i "${srcdir}/iwlagn-fix-NULL-pointer-dereference.patch" + + # Fix dib0700 driver + # http://git.linuxtv.org/pb/media_tree.git/shortlog/refs/heads/for_v3.0 + # FS#25939 + patch -Np1 -i "${srcdir}/dib0700-fix.patch" + + # Add the USB_QUIRK_RESET_RESUME for several webcams + # FS#26528 + patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -44,7 +78,7 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile msg2 "Adding loongson-community patches" - patch -Np1 -i "${srcdir}/${_basekernel}-*-loongson-community.patch" + patch -Np1 -i ${srcdir}/${_basekernel}-*-loongson-community.patch patch -Np0 -i "${srcdir}/lxo-config.patch" # ensure N32 @@ -321,3 +355,17 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } +md5sums=('d73df15ab1d36fe3c102755d8f42117f' + '8fce130ed65a5958252cb4f35382d4ef' + 'a7cbd8c216a1f4c6068625c4dc746164' + '616e05f7436572a7e83500b5daa7e958' + 'a8a3843046926eb7ab81312cd438c5c5' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '980efbecb40b90c224a904dd953e5354' + '2344fe139fca123ba6095968ebeb4e67' + '7dd579902b9d87d8d7063712ffc3e6aa' + '3bacb994ce2995a3e95692cde78c5879' + '8c83acd60ed5c33747b01532d90edd64') diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 493a6e3a7..622d2bde0 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.0-2-LIBRE +KERNEL_VERSION=3.1.0-3-LIBRE post_install () { # updating module dependencies diff --git a/social/ffingerd/PKGBUILD b/social/ffingerd/PKGBUILD index 4e312232b..dd87137ab 100644 --- a/social/ffingerd/PKGBUILD +++ b/social/ffingerd/PKGBUILD @@ -2,7 +2,7 @@ pkgname=ffingerd pkgver=1.28 pkgrel=2 pkgdesc="Secure finger daemon" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.fefe.de/ffingerd/" license=('GPL2') depends=('glibc' 'xinetd') diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD index ef18a4109..8d7c70484 100644 --- a/social/liblockfile/PKGBUILD +++ b/social/liblockfile/PKGBUILD @@ -19,11 +19,12 @@ build() { patch -p1 < ../debian/patches/$p done - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-static + sed -i "/ldconfig/d" Makefile + make - mkdir -p $startdir/pkg/usr/{lib,bin,include,share/man/man1,share/man/man3} - make install prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man || return 1 + mkdir -p $pkgdir/usr/{lib,bin,include,share/man/man1,share/man/man3} + make install prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man } md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e' diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD index ea43adfab..677b12f39 100644 --- a/social/libowfat/PKGBUILD +++ b/social/libowfat/PKGBUILD @@ -7,7 +7,7 @@ pkgname=libowfat pkgver=0.28 pkgrel=4 pkgdesc='GPL reimplementation of libdjb' -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url=http://www.fefe.de/libowfat/ depends=() license=(GPL) diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD index 5bf4ec95b..5e404c684 100644 --- a/social/lockfile-progs/PKGBUILD +++ b/social/lockfile-progs/PKGBUILD @@ -12,9 +12,11 @@ makedepends=('liblockfile') source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz) build() { - cd $startdir/src/sid + cd $srcdir/sid - make || return 1 + [ "$CARCH" = "mips64el" ] && sed -i "s/-Werror//" Makefile + + make mkdir -p $startdir/pkg/usr/bin install -s bin/* $startdir/pkg/usr/bin diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD index f328607e7..d78d14541 100644 --- a/social/opentracker/PKGBUILD +++ b/social/opentracker/PKGBUILD @@ -4,13 +4,13 @@ pkgname=opentracker pkgver=20111020 pkgrel=1 pkgdesc='An open and free bittorrent tracker (open mode)' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://erdgeist.org/arts/software/opentracker/' license=('custom:Beer' 'GPL') -makedepends=('libowfat' 'cvs') +makedepends=('libowfat') # 'cvs') depends=('bash' 'zlib') backup=('etc/opentracker/config') -install=${pkgname}.install +#install=${pkgname}.install source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" 'opentracker.rc.d' 'license.txt') -- cgit v1.2.3-54-g00ecf