From 9f6b0e3307f40a6115482338178e41c52c8cc072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 5 Jan 2012 16:12:34 -0300 Subject: Rebuilds and minor changes --- libre/icecat/PKGBUILD | 8 +++--- libre/mplayer-vaapi-libre/PKGBUILD | 58 ++++++++++++++++---------------------- libre/psutils-libre/PKGBUILD | 42 +++++++++++++++++---------- libre/texlive-bin-libre/PKGBUILD | 6 ++-- 4 files changed, 58 insertions(+), 56 deletions(-) (limited to 'libre') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 9ab8d6c71..718f03057 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -70,18 +70,18 @@ build() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - #patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" # Solve missing reporter locales and preprocessor.pl -# cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ + cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ # Default prefs, remove Google stuff cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ cp "$srcdir/mozconfig" .mozconfig - #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" - #patch -Np1 -i "$srcdir/firefox-version.patch" + patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" + patch -Np1 -i "$srcdir/firefox-version.patch" # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 73f3e6022..1904d4ec4 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -6,53 +6,39 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre -pkgver=33161 -_vaapi_version=20110127 -pkgrel=3 -pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support" +pkgver=34180 +_sha1=79e6aa7b +pkgrel=2 arch=('i686' 'x86_64') url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/" license=('GPL') depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' - 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa' 'smbclient' - 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'speex' - 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' - 'libvpx' 'libpulse' 'fribidi' 'faad2' 'libva' 'libass' - 'desktop-file-utils') -makedepends=('unzip' 'live-media' 'yasm' 'ladspa') + 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa' + 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'speex' + 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' + 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2' + 'libva' 'libass' 'desktop-file-utils') +makedepends=('p7zip-libre' 'live-media' 'yasm' 'ladspa' 'git') provides=("$_pkgname=$pkgver" 'mplayer') conflicts=('mplayer' "$_pkgname") replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz - http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2 +#source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz +# http://www.splitted-desktop.com/static/libva/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2 +source=(mplayer-vaapi-$_sha1.tar.gz::http://gitorious.org/vaapi/mplayer/archive-tarball/$_sha1 mplayer.desktop - mplayer.png - patch-fixes.patch - gcc-4.6-mp3lib-sse-code-miscompilation.patch) + mplayer.png) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install -md5sums=('b8b2842ba3fff04a9b64a94bd2b0a667' - 'b39bd73ae8241dcb21dd1a8fa5eb87eb' - '647b9f4ab5284a7fef3f84f992214e77' - 'd00874ccc644b7f43d6ef1c942fcef28' - 'c7a1df1c1d0f1e51ee400d96b0f34195' - 'd56174335d3c5bcdf3732f4a869f01dd') +sha256sums=('df3ec3d6eba8fd66d6ed7e84dcc909db3b0dcbee2fafdff86c8e66340de1e323' + '9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da' + '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48') build() { - cd "$srcdir/mplayer-$pkgver" + cd "$srcdir/vaapi-mplayer" - # Update vaapi patches for changes introduced in mplayer/ffmpeg - patch -d "$srcdir/mplayer-vaapi-$_vaapi_version" -p1 -i \ - "$srcdir/patch-fixes.patch" - - # Workaround mp3lib SSE code miscompilation with gcc 4.6 (r33469 upstream) - # Patch by Jindrich Makovicka gmail> - patch -Np0 -i "$srcdir/gcc-4.6-mp3lib-sse-code-miscompilation.patch" - - for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do - patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch" - done + [[ -d ffmpeg ]] && rm -rf ffmpeg + tsocks git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -65,6 +51,7 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ + --disable-ass-internal \ --disable-faac \ --enable-xvmc \ --disable-vdpau \ @@ -78,7 +65,7 @@ build() { } package() { - cd "$srcdir/mplayer-$pkgver" + cd "$srcdir/vaapi-mplayer" make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" @@ -91,3 +78,6 @@ package() { } # vim:set ts=2 sw=2 et: +sha256sums=('ab9386e81df7ea7f25102940f7d86fdac797bcdc9b489e0ce118c505c02508ba' + '9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da' + '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48') diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index 6ed3b7f60..4cb5ac014 100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD @@ -1,31 +1,43 @@ -# Maintainer: Henry Jensen +# $Id: PKGBUILD 140791 2011-10-19 10:03:22Z andrea $ +# Maintainer: Ronald van Haren +# Contributor: eric # Contributor: Tom Newsom # Contributor: xihh pkgname=psutils-libre pkgver=1.17 -pkgrel=1 +pkgrel=3 +arch=('i686' 'x86_64' 'mips64el') pkgdesc="A set of postscript utilities" -arch=(i686 x86_64) +url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html" license=('custom') -depends=('glibc' 'ghostscript') +depends=('glibc' 'ghostscript-libre') provides=('psutils-lprng' 'psutils') replaces=('psutils-lprng' 'psutils') conflicts=('psutils-lprng' 'psutils') -url="http://www.connochaetos.org" -source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz) -md5sums=('5553b70be2484cef7a76d741a26f24d5') +options=('!makeflags') +source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz + 'psutils-1.17.diff') +md5sums=('5553b70be2484cef7a76d741a26f24d5' + '2b49e9e796000b42f42804d4b50a2be1') build() { cd "${srcdir}/${pkgname}" + patch -Np1 -i "${srcdir}/psutils-1.17.diff" + make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ + INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ + MANDIR="${pkgdir}/usr/share/man/man1" \ + CFLAGS="$CFLAGS -DPAPER=\\\"letter\\\" -DUNIX -Wall" \ + CCFLAGS="$LDFLAGS" +} + +package() { + cd "${srcdir}/${pkgname}" + install -d -m755 "${pkgdir}/usr/include" install -d -m755 "${pkgdir}/usr/share/man" - make -j1 -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ - PERL=/usr/bin/perl \ - MANDIR="${pkgdir}/usr/share/man/man1" || return 1 - make -j1 -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ - PERL=/usr/bin/perl \ - MANDIR="${pkgdir}/usr/share/man/man1" install || return 1 + make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ + INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ + MANDIR="${pkgdir}/usr/share/man/man1" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 - install -m644 LICENSE.orig "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 25048150c..b5fb37c85 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,15 +5,15 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=5.1 +pkgrel=5.2 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') -depends=('t1lib' 'gd' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'poppler>=0.18.2' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.3') +conflicts=('pdfjam' 'texlive-bin') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' -- cgit v1.2.3-2-g168b