diff options
Diffstat (limited to 'extra')
25 files changed, 245 insertions, 77 deletions
diff --git a/extra/bluez/0001-udev-remove-deprecated-function.patch b/extra/bluez/0001-udev-remove-deprecated-function.patch new file mode 100644 index 000000000..7dadf5cd1 --- /dev/null +++ b/extra/bluez/0001-udev-remove-deprecated-function.patch @@ -0,0 +1,27 @@ +From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sun, 27 May 2012 00:53:36 +0200 +Subject: [PATCH] udev: remove deprecated function + +This function has in the past returned "/sys" unconditionally. As of udev-183 it +is gone, so just replace it with the string. +--- + tools/hid2hci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/hid2hci.c b/tools/hid2hci.c +index 45a3a3d..e3a5b2e 100644 +--- a/tools/hid2hci.c ++++ b/tools/hid2hci.c +@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) + if (udev == NULL) + goto exit; + +- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); ++ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); + udev_dev = udev_device_new_from_syspath(udev, syspath); + if (udev_dev == NULL) { + fprintf(stderr, "error: could not find '%s'\n", devpath); +-- +1.7.10.2 + diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index e63cd2c66..d56ba44cd 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155739 2012-04-06 00:05:49Z tomegun $ +# $Id: PKGBUILD 160353 2012-06-01 12:58:12Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.99 -pkgrel=2 +pkgrel=6 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -25,6 +25,7 @@ options=('!libtool') backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" + '0001-udev-remove-deprecated-function.patch' 'bluetooth.conf.d' 'rc.bluetooth') @@ -47,7 +48,11 @@ build() { --enable-dund \ --enable-cups \ --enable-wiimote \ - --disable-test + --disable-test \ + --with-systemdunitdir=/usr/lib/systemd/system + + patch -p1 -i ../0001-udev-remove-deprecated-function.patch + make } @@ -76,9 +81,10 @@ package() { "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input - # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html + # fixed upstream in git rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } md5sums=('2387053eb5a7b02f37df4871df022a02' + '3175155fbaf73f01377f6c35b5c5e468' '7412982b440f29fa7f76a41a87fef985' '8f9498707f809506928b2e480d3b6789') diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD index 5a3fb66b0..47ec45855 100644 --- a/extra/clutter-gtk2/PKGBUILD +++ b/extra/clutter-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147074 2012-01-21 15:12:46Z ibiru $ +# $Id: PKGBUILD 160400 2012-06-01 15:37:09Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gtk2 _pkgbasename=clutter-gtk pkgver=0.10.8 -pkgrel=2 +pkgrel=3 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -24,6 +24,7 @@ build() { patch -Np1 -i "$srcdir/gir.patch" patch -Np1 -i "$srcdir/libm.patch" autoreconf -i + export CFLAGS+=" -lgthread-2.0" ./configure --prefix=/usr make } diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD index c03db85c1..37a8a14c4 100644 --- a/extra/consolekit/PKGBUILD +++ b/extra/consolekit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158560 2012-05-04 23:57:00Z allan $ +# $Id: PKGBUILD 160357 2012-06-01 12:58:20Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=consolekit pkgver=0.4.6 -pkgrel=3 +pkgrel=4 pkgdesc="A framework for defining and tracking users, login sessions, and seats" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/ConsoleKit" @@ -16,6 +16,10 @@ options=(!libtool) # this has not been released yet, so this is a snapshot source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2 pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf) +md5sums=('810990b607e338f06a6396c92b8a4a06' + 'a8a4de71d9b0549b8143e5f6c2a36fc7' + '6fefa451d9fe2fc6d6269629d3529793' + '8c5a8059db515d40fae1379daf084094') build() { cd "$srcdir/ConsoleKit-$pkgver" @@ -43,7 +47,3 @@ package() { rm -rf "${pkgdir}/var/run" } -md5sums=('810990b607e338f06a6396c92b8a4a06' - 'a8a4de71d9b0549b8143e5f6c2a36fc7' - '6fefa451d9fe2fc6d6269629d3529793' - '8c5a8059db515d40fae1379daf084094') diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 557724347..fd272e9f4 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159195 2012-05-17 15:22:23Z ibiru $ +# $Id: PKGBUILD 160359 2012-06-01 12:58:23Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.12.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD index 7a1ec6b47..36c54c9e8 100644 --- a/extra/libatasmart/PKGBUILD +++ b/extra/libatasmart/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 141499 2011-10-31 03:19:13Z andrea $ +# $Id: PKGBUILD 160363 2012-06-01 12:58:30Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libatasmart pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64') license=('LGPL') -depends=('udev>=174') +depends=('udev') url="http://0pointer.de/blog/projects/being-smart.html" options=('!libtool') source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz") diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index bde46da57..f4f54557c 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158131 2012-05-03 13:15:53Z heftig $ +# $Id: PKGBUILD 160365 2012-06-01 12:58:34Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.28 -pkgrel=4 +pkgrel=5 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=('LGPL') @@ -35,7 +35,7 @@ package_libcanberra() { make -j1 DESTDIR="${pkgdir}" install rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la - + install -d "${pkgdir}/usr/share/gconf" mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 0b77550ce..ada897178 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159247 2012-05-19 08:19:03Z andyrtr $ +# $Id: PKGBUILD 160367 2012-06-01 12:58:38Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -15,13 +15,14 @@ if [ "${_git}" = "true" ]; then else pkgver=8.0.3 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev') + 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE) +source=(LICENSE + mesa-8.0.3-llvm-3.1-fixes.patch) if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') @@ -33,11 +34,14 @@ if [ "${_git}" = "true" ]; then ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + 'c452ed3392468170726c004c2f4e02ca' 'cc5ee15e306b8c15da6a478923797171') build() { cd ${srcdir}/?esa-* + patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" + if [ "${_git}" = "true" ]; then autoreconf -vfi ./autogen.sh --prefix=/usr \ diff --git a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 000000000..a567b5926 --- /dev/null +++ b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,46 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<MCInstPrinter> Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } + + diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index c5f6e4b38..de9352da5 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155966 2012-04-10 09:35:44Z bisson $ +# $Id: PKGBUILD 160342 2012-06-01 11:41:45Z 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.16.8 -pkgrel=2 +pkgrel=3 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' license=('GPL') @@ -17,10 +17,13 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f 'libpulse') makedepends=('doxygen') source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" + 'tmpfiles.d' 'rc.d') sha1sums=('977c80db8dc64e65c2bc523f69a9a7a71adca2b1' - '3777bdb4fff4b7911be3b1242aabae9d2912ef18') + 'f4d5922abb69abb739542d8e93f4dfd748acdad7' + '3470d489565f0ed479f1665dd2876f66acb5a585') +backup=('etc/mpd.conf') install=install build() { @@ -57,5 +60,6 @@ package() { install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example + install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf } diff --git a/extra/mpd/install b/extra/mpd/install index 655645716..261b8fd0d 100644 --- a/extra/mpd/install +++ b/extra/mpd/install @@ -1,10 +1,11 @@ post_install() { getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null - getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/true -G audio mpd >/dev/null - echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example' + getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null + true } post_remove() { getent passwd mpd &>/dev/null && userdel mpd >/dev/null getent group mpd &>/dev/null && groupdel mpd >/dev/null + true } diff --git a/extra/mpd/rc.d b/extra/mpd/rc.d index 86f77419f..f00e16067 100755 --- a/extra/mpd/rc.d +++ b/extra/mpd/rc.d @@ -3,8 +3,6 @@ . /etc/rc.conf . /etc/rc.d/functions -[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd - case "$1" in start) stat_busy 'Starting Music Player Daemon' diff --git a/extra/mpd/tmpfiles.d b/extra/mpd/tmpfiles.d new file mode 100644 index 000000000..41c4e743a --- /dev/null +++ b/extra/mpd/tmpfiles.d @@ -0,0 +1 @@ +d /run/mpd 0755 mpd mpd diff --git a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch new file mode 100644 index 000000000..93167b79b --- /dev/null +++ b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch @@ -0,0 +1,80 @@ +From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sat, 26 May 2012 02:58:11 +0200 +Subject: [PATCH] Remove usage of deprecated udev_get_*_path + +These symbols were removed in libudev.so.1.0.0. Replace them with +hardcoded strings. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/modules/module-udev-detect.c | 9 +++------ + src/modules/udev-util.c | 4 ++-- + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c +index 1192194..31416bd 100644 +--- a/src/modules/module-udev-detect.c ++++ b/src/modules/module-udev-detect.c +@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { + pa_assert(u); + pa_assert(d); + +- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); ++ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); + accessible = access(cd, R_OK|W_OK) >= 0; + pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); + +@@ -621,7 +621,6 @@ fail: + } + + static int setup_inotify(struct userdata *u) { +- char *dev_snd; + int r; + + if (u->inotify_fd >= 0) +@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { + return -1; + } + +- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); +- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); +- pa_xfree(dev_snd); ++ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); + + if (r < 0) { + int saved_errno = errno; +diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c +index 2f18bc4..b0bb17d 100644 +--- a/src/modules/udev-util.c ++++ b/src/modules/udev-util.c +@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +-- +1.7.10.2 + diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 41bf3fad1..cca5f2472 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158827 2012-05-11 21:11:56Z heftig $ +# $Id: PKGBUILD 160369 2012-06-01 12:58:42Z dreisner $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,7 +8,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=2.0 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -18,13 +18,17 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit libsystemd) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit) + pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' + '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') build() { cd $pkgbase-$pkgver + # libudev.so.1.0.0 + patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index fd7db3b36..1dc4cefb3 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -8,16 +8,12 @@ MES } post_upgrade() { - # Delete old users and groups - # System-wide daemon not supported anymore - if (( $(vercmp $2 0.9.22) < 0 )); then - getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse - getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access - getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt - getent group pulse &>/dev/null && usr/sbin/groupdel pulse - fi - - true + cat << MES +>>> If you have per-user copies of configuration files (such as client.conf, + daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync + with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio + may refuse to start due to configuration errors. +MES } # vim:set ts=2 sw=2 et: diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 290f217e2..6882fd26a 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159123 2012-05-16 10:08:44Z tpowa $ +# $Id: PKGBUILD 160385 2012-06-01 13:01:31Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.3 -pkgrel=3 +pkgrel=4 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64') url='http://slim.berlios.de/' @@ -23,7 +23,6 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'session-name.patch' 'fix-numlock-1.3.3.patch') - install=install build() { @@ -60,7 +59,7 @@ md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' 'd8ea9c4dee2811524b67f4f666311a1f' 'ebfff3417058619a1328284ae0e2f48e' '43da096480bf72c3ccec8ad8400f34f0' - 'aef560f5a765582b2a7fc1fac5b323a7' + '7c0bf1fb6292537e2c63ec04f8532079' 'ae4b237d472ec5d373e30080aa0ff804' 'ebcb6829028615686de7b64ceeaaf8ed' '6c29c93370e44ed310ff30132424b619') diff --git a/extra/slim/slim.service b/extra/slim/slim.service index 26093a8bf..18d8c99be 100644 --- a/extra/slim/slim.service +++ b/extra/slim/slim.service @@ -1,7 +1,6 @@ [Unit] Description=SLiM Simple Login Manager -Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service +After=systemd-user-sessions.service [Service] ExecStart=/usr/bin/slim -nodaemon diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index a34978cfa..4393e612a 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 155747 2012-04-06 00:06:00Z tomegun $ +# $Id: PKGBUILD 160371 2012-06-01 12:58:45Z dreisner $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.9 -pkgrel=2 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') license=('GPL') -makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils') +makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' + 'libusb-compat' 'desktop-file-utils') source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) md5sums=('df424f127eede63965608e5ec5e27519' 'd105b7f7725c1ec538b6e6adb10667f3') @@ -21,7 +22,10 @@ build() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer + + # Fix build with udev 183 + sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c ./configure --prefix=/usr \ --sbindir=/usr/bin \ diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 74eef1d57..e576d2e89 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155737 2012-04-06 00:05:45Z tomegun $ +# $Id: PKGBUILD 160373 2012-06-01 12:58:48Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks pkgver=1.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -18,15 +18,13 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static - #fix location for bash_completion helper - sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" # move udev helpers and rules to /usr/lib mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ rm -r "${pkgdir}"/lib diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index b94cfda1d..7c1e9bf6b 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153753 2012-03-19 15:14:49Z giovanni $ +# $Id: PKGBUILD 160375 2012-06-01 12:58:51Z dreisner $ # 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.1 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index a6d670028..5735fc350 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 159235 2012-05-18 15:27:54Z andyrtr $ +# $Id: PKGBUILD 160377 2012-06-01 12:58:56Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati pkgver=6.14.99 _gitdate=20120517 -pkgrel=0.${_gitdate} +pkgrel=1.${_gitdate} # UMS/EXA: Add reminder for potential solid picture performance issue. pkgdesc="X.org ati video driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libpciaccess' 'libdrm>=2.4.33' 'udev' 'pixman' 'ati-dri') +depends=('libpciaccess' 'libdrm>=2.4.33' 'udev>=183' 'pixman' 'ati-dri') makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto') conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index b0459b075..90404585d 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 158952 2012-05-13 15:44:53Z andyrtr $ +# $Id: PKGBUILD 160379 2012-06-01 12:59:00Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel pkgver=2.19.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev>=183') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 8e2dffd5d..a9fc10cbd 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 158956 2012-05-13 15:53:05Z ibiru $ +# $Id: PKGBUILD 160381 2012-06-01 12:59:04Z dreisner $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau _gitdate=20120512 pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=1 -pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" +pkgrel=2 +pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)" arch=('i686' 'x86_64') url="http://nouveau.freedesktop.org/wiki/" license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 47873d47f..0219bde16 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159267 2012-05-20 08:22:19Z andyrtr $ +# $Id: PKGBUILD 160383 2012-06-01 12:59:08Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.1.902 +pkgver=1.12.2 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -11,7 +11,7 @@ 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' 'udev' 'libgcrypt') + 'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch @@ -21,7 +21,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509' +sha256sums=('ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' |