diff options
25 files changed, 106 insertions, 218 deletions
diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD index f7baae1c0..7963a16ff 100644 --- a/community/ffmpeg-compat/PKGBUILD +++ b/community/ffmpeg-compat/PKGBUILD @@ -7,7 +7,7 @@ pkgname=ffmpeg-compat pkgver=0.10.8 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' arch=('i686' 'x86_64') @@ -20,7 +20,6 @@ depends=( 'v4l-utils' 'x264' 'xvidcore' 'zlib' ) makedepends=('libvdpau' 'yasm') -install=$pkgname.install source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) sha256sums=('2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8') @@ -71,7 +70,7 @@ package() { rm -rf "$pkgdir"/usr/{bin,share} install -dm755 "$pkgdir"/etc/ld.so.conf.d/ - echo '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf + echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf } # vim:set ts=2 sw=2 et: diff --git a/community/ffmpeg-compat/ffmpeg-compat.install b/community/ffmpeg-compat/ffmpeg-compat.install deleted file mode 100644 index 91de66756..000000000 --- a/community/ffmpeg-compat/ffmpeg-compat.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/ldconfig -r . -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/midori-gtk3/PKGBUILD b/community/midori-gtk3/PKGBUILD index 38ee8efcc..8f2deb460 100644 --- a/community/midori-gtk3/PKGBUILD +++ b/community/midori-gtk3/PKGBUILD @@ -1,28 +1,20 @@ -# $Id: PKGBUILD 94966 2013-08-01 20:26:43Z arodseth $ +# $Id: PKGBUILD 94988 2013-08-02 13:05:49Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> -# -# Note: -# -# * Depending on and compiling with 'granite' didn't work last time I tried. -# * If steadyflow is moved to [community] or [extra], it can be added as an optdepends. -# - pkgname=midori-gtk3 pkgver=0.5.4 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight web browser (GTK3)' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' conflicts=('midori') -replaces=('midori') provides=('midori') depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') @@ -35,6 +27,7 @@ sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') build() { cd "$srcdir/midori_${pkgver}_all_" + # if granite is present, the build fails (last time I tried) python2 ./waf configure \ --prefix=/usr \ --enable-gtk3 \ diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index e0cbe2f8a..f29243781 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94963 2013-08-01 19:50:34Z arodseth $ +# $Id: PKGBUILD 94981 2013-08-02 10:17:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,23 +6,15 @@ # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> -# -# Note: -# -# * Depending on and compiling with 'granite' didn't work last time I tried. -# * To compile with gtk3 instead of gtk2, depend on 'webkitgtk' and 'gtk3' then --enable-gtk3. -# * If steadyflow is moved to [community] or [extra], it can be added as an optdepends. -# - pkgname=midori pkgver=0.5.4 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight web browser (GTK2)' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' -depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') +depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique' 'gcr') makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index b6b2cc3e9..34050cc83 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92281 2013-06-03 13:37:54Z spupykin $ +# $Id: PKGBUILD 94986 2013-08-02 13:00:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> @@ -6,20 +6,17 @@ pkgname=xdebug pkgver=2.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64') url="http://www.xdebug.org" license=('GPL') depends=('php') -install="${pkgname}.install" backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz - xdebug-5.2.ini xdebug.ini) md5sums=('e49cec9861b45dc0b36eae33bf8a14fa' - '6b7fdbbe0bf381bda40e77e29981f439' - '68de800943369d4c76bdf7eb35c8463b') + '6a1f2ef91c632d4c9b7b218cd2e278ef') build() { cd $srcdir/$pkgname-$pkgver @@ -39,11 +36,6 @@ package() { make DESTDIR=$pkgdir install cd $srcdir/$pkgname-$pkgver - if [ "$PHPVER" \< "5.3.0" ] ; then - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so - install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini - else - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so - install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini - fi + make INSTALL_ROOT=$pkgdir install + install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini } diff --git a/community/xdebug/xdebug-5.2.ini b/community/xdebug/xdebug-5.2.ini deleted file mode 100644 index 9beb7fc30..000000000 --- a/community/xdebug/xdebug-5.2.ini +++ /dev/null @@ -1,5 +0,0 @@ -zend_extension=/usr/lib/php/xdebug.so -;xdebug.remote_enable=on -;xdebug.remote_host=127.0.0.1 -;xdebug.remote_port=9000 -;xdebug.remote_handler=dbgp diff --git a/community/xdebug/xdebug.ini b/community/xdebug/xdebug.ini index c6c9222ea..9062dfc8b 100644 --- a/community/xdebug/xdebug.ini +++ b/community/xdebug/xdebug.ini @@ -1,4 +1,4 @@ -zend_extension=/usr/lib/php/modules/xdebug.so +;zend_extension=/usr/lib/php/modules/xdebug.so ;xdebug.remote_enable=on ;xdebug.remote_host=127.0.0.1 ;xdebug.remote_port=9000 diff --git a/community/xdebug/xdebug.install b/community/xdebug/xdebug.install deleted file mode 100644 index a7ec0b9cc..000000000 --- a/community/xdebug/xdebug.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - local _configfile=/etc/php/conf.d/xdebug.ini - echo " ==> You may wish to uncomment/change the settings found in " - echo " $_configfile" - echo "" -} - -post_upgrade() { - local _configfile=/etc/php/conf.d/xdebug.ini - local PHPVER=$(php -r 'echo phpversion();') - post_install $1 - - if [ "$PHPVER" \< "5.3" ] ; then - echo " ==> You are currenty running a version of php < 5.3." - echo " When/if you upgrade php to a version >= 5.3, you will need to reinstall $pkgname." - echo "" - fi -} diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 7b254540a..d8ead584f 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183046 2013-04-17 02:02:01Z allan $ +# $Id: PKGBUILD 191960 2013-08-02 00:55:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.7.1 +pkgver=3.0 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7be02eb973eccf388f1ae750fc09eed0' +md5sums=('a2624994561aa69f056c904c1ccb2880' 'SKIP') build() { diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 73d6ef280..f40139fbb 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186997 2013-06-03 02:50:08Z allan $ +# $Id: PKGBUILD 191961 2013-08-02 00:55:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.8.1 -pkgrel=1 -#_snapshot=4.8-20130502 +pkgrel=2 +_snapshot=4.8-20130725 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -15,9 +15,11 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 -md5sums=('3b2386c114cd74185aa3754b58a79304') +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + gcc-4.8-filename-output.patch) +md5sums=('e21f259bc4c44e61e19a780ad5badfeb' + '40cb437805e2f7a006aa0d0c3098ab0f') if [ -n "${_snapshot}" ]; then @@ -40,6 +42,9 @@ prepare() { # hack! - some configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653 + patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch + mkdir ${srcdir}/gcc-build } diff --git a/core/gcc/gcc-4.8-filename-output.patch b/core/gcc/gcc-4.8-filename-output.patch new file mode 100644 index 000000000..6951eb239 --- /dev/null +++ b/core/gcc/gcc-4.8-filename-output.patch @@ -0,0 +1,17 @@ +--- gcc/c-family/c-opts.c (revision 200330) ++++ gcc/c-family/c-opts.c (working copy) +@@ -1338,10 +1338,14 @@ c_finish_options (void) + + /* Give CPP the next file given by -include, if any. */ + static void + push_command_line_include (void) + { ++ // This can happen if disabled by -imacros for example. ++ if (include_cursor > deferred_count) ++ return; ++ + if (!done_preinclude) + { + done_preinclude = true; + if (flag_hosted && std_inc && !cpp_opts->preprocessed) + { diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 0acf19815..93148e7a0 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ +# $Id: PKGBUILD 191974 2013-08-02 17:22:54Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.3 +pkgver=2.7 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('99e311b2202057a259899f67b425e087' +md5sums=('61093c08ca5d8d1310382d17764f0c43' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index bc0ca0964..75dc33e40 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190837 2013-07-18 12:47:47Z lcarlier $ +# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=9.1.5 +pkgver=9.1.6 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -14,7 +14,7 @@ license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('4ed2af5943141a85a21869053a2fc2eb' +md5sums=('443a2a352667294b53d56cb1a74114e9' '5c65a0fe315dd347e09b1f2826a1df5a') build() { diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 0c792edca..7fca81c86 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191903 2013-08-01 06:53:36Z bpiotrowski $ +# $Id: PKGBUILD 191959 2013-08-02 00:36:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mpd pkgver=0.17.4 -pkgrel=4 +pkgrel=5 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') @@ -37,6 +37,7 @@ build() { --enable-jack \ --enable-lastfm \ --enable-soundcloud \ + --enable-pipe-output \ --enable-pulse \ --disable-sidplay \ --with-systemdsystemunitdir=/usr/lib/systemd/system diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 2c93a076c..4259a905c 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190827 2013-07-18 07:23:31Z bisson $ +# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=15 +pkgrel=17 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -19,8 +19,8 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpdate.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' - 'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95' - '0cb9dbd285e2e8ac51ff47dee08af69e12a09855' + 'ff8370719f003f184563b7d6068c03086678482f' + 'e1c48cba549b7d21501aadf513926e463884c090' ) install=install diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index 4e3290858..45239877f 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -6,7 +6,6 @@ After=network.target nss-lookup.target Type=forking PrivateTmp=true ExecStart=/usr/bin/ntpd -g -u ntp:ntp -ControlGroup=cpu:/ Restart=always [Install] diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate deleted file mode 100755 index a8e746785..000000000 --- a/extra/ntp/ntpdate +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -case "$1" in - start) - stat_busy "Starting NTP Client" - if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then - add_daemon ntpdate - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ntp/ntpdate.service b/extra/ntp/ntpdate.service index 82d72d8b6..094dd42c8 100644 --- a/extra/ntp/ntpdate.service +++ b/extra/ntp/ntpdate.service @@ -6,7 +6,6 @@ After=network.target nss-lookup.target Type=oneshot PrivateTmp=true ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp -ControlGroup=cpu:/ [Install] WantedBy=multi-user.target diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD deleted file mode 100644 index e0de53cba..000000000 --- a/extra/truecrypt/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 171369 2012-11-17 11:36:42Z eric $ -# Maintainer: Paul Mattal <paul.archlinux.org> - -pkgname=truecrypt -pkgver=7.1a -pkgrel=1 -epoch=1 -pkgdesc="Free open-source cross-platform disk encryption software" -url="http://www.truecrypt.org/" -arch=('i686' 'x86_64') -license=('custom') # TrueCrypt License v2.6 -depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper') -makedepends=('nasm') -optdepends=('sudo: mounting encrypted volumes as nonroot users') -conflicts=('truecrypt-utils') -replaces=('truecrypt-utils') -# N.B. Truecrypt's web-based source download is incompatible with -# makepkg. Source has been placed on ftp.archlinux.org instead -source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ - 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ - "${pkgname}.desktop" \ - "${pkgname}-arch-detection.patch") -md5sums=('102d9652681db11c813610882332ae48' - '5bca3d15b35d0725ff3317e568062ad8' - 'ce6a707b79411e82e8e558aa03e764b0' - '183b9bf04a943454d4e216130bcbac01' - '00ea70fa8437de877b31b027ac2b4060') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-source" - - # Work around buggy CPU type detection - patch -Np1 -i ../${pkgname}-arch-detection.patch - - # Build - make PKCS11_INC="${srcdir}/pkcs-2.20" LFLAGS+="-ldl" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-source" - - # Install Binary - install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" - - # Install Desktop file and Icon - install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" - - # Install License - install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" -} diff --git a/extra/truecrypt/truecrypt-arch-detection.patch b/extra/truecrypt/truecrypt-arch-detection.patch deleted file mode 100644 index bc16a2a36..000000000 --- a/extra/truecrypt/truecrypt-arch-detection.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile ---- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400 -+++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400 -@@ -120,10 +120,7 @@ - - export CPU_ARCH ?= unknown - --ARCH = $(shell uname -p) --ifeq "$(ARCH)" "unknown" -- ARCH = $(shell uname -m) --endif -+ARCH = $(shell uname -m) - - ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) - CPU_ARCH = x86 diff --git a/extra/truecrypt/truecrypt.desktop b/extra/truecrypt/truecrypt.desktop deleted file mode 100644 index 53626f29f..000000000 --- a/extra/truecrypt/truecrypt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=truecrypt -Icon=truecrypt -Comment=On-the-fly encryption -Terminal=false -Name=TrueCrypt -StartupNotify=true -Categories=System; diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 94c1c843f..3e636d515 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191910 2013-08-01 06:53:43Z bpiotrowski $ +# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.8 +pkgver=2.0.8.a pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') @@ -56,22 +56,25 @@ backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool' '!emptydirs') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" - vlc-2.0.7-vaapi-compat.patch) -md5sums=('3b0e465b0990097b65abaf3e25589957' - '6df10774bb7acf20e09d6139e5c7839e') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz" + vlc-2.0.7-vaapi-compat.patch + vlc-2.0.8-Fix-live555-breakage-in-last-update.patch) +md5sums=('e5000677181406d026ffe448633d1ca0' + '6df10774bb7acf20e09d6139e5c7839e' + 'e592efe7bb65291a84f99cfaa3a9f8a2') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.a}" patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch + patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.a}" CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ @@ -98,12 +101,12 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.a}" make DESTDIR="${pkgdir}" install for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done } diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch new file mode 100644 index 000000000..3006cbc8d --- /dev/null +++ b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch @@ -0,0 +1,29 @@ +From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Thu, 25 Jul 2013 01:14:32 +0200 +Subject: [PATCH] Fix live555 breakage in last update + +--- + modules/demux/live555.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp +index 9e02630..7a1ab16 100644 +--- a/modules/demux/live555.cpp ++++ b/modules/demux/live555.cpp +@@ -243,7 +243,11 @@ public: + char const* applicationName, portNumBits tunnelOverHTTPPortNum, + demux_sys_t *p_sys) : + RTSPClient( env, rtspURL, verbosityLevel, applicationName, +- tunnelOverHTTPPortNum ) ++ tunnelOverHTTPPortNum ++#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800 ++ , -1 ++#endif ++ ) + { + this->p_sys = p_sys; + } +-- +1.8.3.4 + diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index eadc50e7c..775010075 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191911 2013-08-01 06:53:44Z bpiotrowski $ +# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 pkgver=20130702 -pkgrel=1 +pkgrel=2 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/x264.html" @@ -15,8 +15,6 @@ makedepends=('yasm' 'git') source=(git://git.videolan.org/x264.git#commit=585324fee3) md5sums=('SKIP') -[[ "$CARCH" == "i686" ]] && _asm='--disable-asm' - pkgver() { cd $pkgname git log -1 --format="%cd" --date=short | sed 's|-||g' @@ -26,8 +24,7 @@ build() { cd $pkgname ./configure --enable-shared \ - --enable-pic \ - $_asm + --enable-pic make } diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 64778701a..311e554e7 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.07.31 +pkgver=2013.08.02 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('879407fed53888aae97a0eda26e693e6' +md5sums=('772d2bbf3e9bcfc3da05d956cf6d8705' 'SKIP') prepare() { |