diff options
Diffstat (limited to 'extra')
29 files changed, 372 insertions, 81 deletions
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 29999bd93..64598ae27 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163145 2012-07-08 09:30:48Z ibiru $ +# $Id: PKGBUILD 171262 2012-11-16 23:35:36Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP new file mode 100644 index 000000000..361aa2665 --- /dev/null +++ b/extra/avidemux/PKGBUILD.WIP @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.6.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ + 'libvdpau' 'libdca' 'fribidi' 'glu') +options=('!makeflags' '!emptydirs') +#source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +#sha1sums=('d886d61eab70f7b1972c0ebdeeeb7d2ba8c30cbf') +source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) +sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') + +build() { +mv snapshot_8273 ${pkgbase}_${pkgver} + + cd "${srcdir}/${pkgbase}_${pkgver}" + sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin' + 'qt: for the QtScript scripting support' + 'libdca: for the corresponding audio decoder plugin' + 'fribidi: for the corresponding video filter plugin') + + cd "${srcdir}/${pkgbase}_${pkgver}" + (cd buildCli; make DESTDIR="${pkgdir}" install) + (cd buildCore; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + (cd buildGtk; make DESTDIR="${pkgdir}" install) + (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + + rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} + rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + (cd buildQt4; make DESTDIR="${pkgdir}" install) + (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + + rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} +} diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index f91d7b265..9fc2c4670 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 170679 2012-11-09 09:15:06Z andrea $ +# $Id: PKGBUILD 171295 2012-11-17 01:49:16Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt') +makedepends=('qt' 'emacs') optdepends=('qt: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") @@ -35,8 +35,10 @@ package() { vimpath="${pkgdir}/usr/share/vim/vimfiles" install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim + install -Dm644 Docs/cmake-mode.el \ "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el + emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el install -Dm644 Copyright.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 559579e14..bf0eb9c94 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167254 2012-09-29 12:49:31Z ibiru $ +# $Id: PKGBUILD 171263 2012-11-16 23:35:38Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg pkgver=1.0 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD index 279f616a2..420187c14 100644 --- a/extra/ftgl/PKGBUILD +++ b/extra/ftgl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168802 2012-10-16 03:14:27Z heftig $ +# $Id: PKGBUILD 171289 2012-11-16 23:57:52Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: tobias <tobias@archlinux.org> @@ -6,13 +6,13 @@ pkgname=ftgl _pkgver=2.1.3-rc5 pkgver=${_pkgver/-/} -pkgrel=4 +pkgrel=5 pkgdesc="OpenGL library to use arbitrary fonts" arch=(i686 x86_64) url="http://ftgl.wiki.sourceforge.net/" -license=(MIT) -depends=(freetype2 mesa glu) -makedepends=(doxygen) +license=('MIT') +depends=('freetype2' 'glu') +makedepends=('doxygen' 'mesa') options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") md5sums=('c7879018cde844059495b3029b0b6503') diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index e7b075473..28f4675b2 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169931 2012-10-30 22:45:31Z heftig $ +# $Id: PKGBUILD 171264 2012-11-16 23:35:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index f27e8cc07..0449c5324 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163150 2012-07-08 09:31:14Z ibiru $ +# $Id: PKGBUILD 171265 2012-11-16 23:35:43Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index 37142d4af..3e808f48f 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 150900 2012-02-23 13:55:06Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 171085 2012-11-16 14:51:57Z allan $ +# Maintainer: +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Juergen Hoetzel <jason@archlinux.org> pkgname=kismet pkgver=2011_03_R2 _realver="${pkgver//_/-}" -pkgrel=4 +pkgrel=5 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') -makedepends=() # already in core: ('grep' 'gcc-libs') +depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl' 'libusb-compat') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' 'sox: provide the default kismet sound playback binary' 'festival: text-to-speech support' 'flite: alternative/lightweight text-to-speech support' - 'mac80211-driver: full rfmon support' 'ruby: ruby interface') backup=('etc/kismet.conf' 'etc/kismet_drone.conf') install=kismet.install changelog=kismet.changelog -source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') +source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz"{,.asc}) +md5sums=('8bf077e8111e6dc8c12cadefdf40aadd' + '500deff918ede6d0bc392a0419322833') build() { cd "${srcdir}/${pkgname}-${_realver}" diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 67e5bb739..5b65b9ead 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 170988 2012-11-14 14:24:25Z juergen $ +# $Id: PKGBUILD 171297 2012-11-17 02:13:54Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.28.0 -pkgrel=3 +pkgrel=4 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.1.1' 'texinfo' 'sh') +depends=('sbcl=1.1.1-2' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/nvidia-304xx-utils/PKGBUILD b/extra/nvidia-304xx-utils/PKGBUILD new file mode 100644 index 000000000..4220b29df --- /dev/null +++ b/extra/nvidia-304xx-utils/PKGBUILD @@ -0,0 +1,98 @@ +# $Id: PKGBUILD 171240 2012-11-16 21:41:01Z ibiru $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> +# Contributor: James Rayner <iphitus@gmail.com> +pkgname=nvidia-304xx-utils +pkgver=304.64 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch" +depends=('xorg-server' 'libxvmc') +optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig' + 'opencl-nvidia: OpenCL support') +conflicts=('libgl' 'nvidia-utils') +provides=('libgl') +license=('custom') +options=('!strip') + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('6964415cf648a5f4f38117b168369de2') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('76007ed4b72afd334e26377b646f5f7e') +fi + +create_links() { + # create soname links + while read -d '' _lib; do + _soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')" + [[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}" + [[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}" + done < <(find "${pkgdir}" -type f -name '*.so*' -print0) +} + +build() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only +} + +package() { + cd "${srcdir}/${_pkg}" + + # X driver + install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" + # GLX extension module for X + install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}" + ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise + # OpenGL library + install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" + # OpenGL core library + install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" + # XvMC + install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a" + install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}" + # VDPAU + install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" + # nvidia-tls library + install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" + + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + # CUDA + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" + + # nvidia-xconfig + install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig" + install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz" + # nvidia-settings + install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" + install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" + install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" + sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" + # nvidia-bug-report + install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh" + # nvidia-smi + install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi" + install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz" + # OpenCL + install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd" + install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}" + install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" + + + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE" + ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils" + install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README" + install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog" + ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils" + + create_links +} diff --git a/extra/nvidia-304xx/PKGBUILD b/extra/nvidia-304xx/PKGBUILD new file mode 100644 index 000000000..75115b81e --- /dev/null +++ b/extra/nvidia-304xx/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 171238 2012-11-16 21:39:23Z ibiru $ +# Maintainer : Thomas Baechler <thomas@archlinux.org> + +pkgname=nvidia-304xx +pkgver=304.64 +_extramodules=extramodules-3.6-ARCH +pkgrel=1 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.6' 'linux<3.7' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=3.6' 'linux-headers<3.7') +conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('6964415cf648a5f4f38117b168369de2') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('76007ed4b72afd334e26377b646f5f7e') +fi + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}/kernel" + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" +} diff --git a/extra/nvidia-304xx/nvidia.install b/extra/nvidia-304xx/nvidia.install new file mode 100644 index 000000000..4cacaa79d --- /dev/null +++ b/extra/nvidia-304xx/nvidia.install @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index b2e18ff20..10ab9674c 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169994 2012-10-30 23:01:05Z heftig $ +# $Id: PKGBUILD 171267 2012-11-16 23:35:49Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.7 -pkgrel=2 +pkgrel=3 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.opalvoip.org" diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 2a743e736..1b53233e4 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149627 2012-02-08 20:47:17Z pierre $ +# $Id: PKGBUILD 171291 2012-11-17 00:59:56Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt pkgver=6.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64') url="http://qwt.sourceforge.net/" @@ -32,6 +32,11 @@ package() { make INSTALL_ROOT=${pkgdir} QTDIR=/usr install + # install web designer plugin + install -d ${pkgdir}/usr/lib/qt/plugins/designer/ + install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \ + ${pkgdir}/usr/lib/qt/plugins/designer/ + # Move man files to proper directory. # install -d ${pkgdir}/usr/share/man/man3 # mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3 diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index b72402f4a..bee6db047 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $ +# $Id: PKGBUILD 171261 2012-11-16 23:35:36Z allan $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qwtplot3d pkgver=0.2.7 -pkgrel=4 +pkgrel=5 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" arch=("i686" "x86_64") license=('custom:zlib') url="http://qwtplot3d.sourceforge.net/" -depends=('qt' 'qwt' 'mesa') +depends=('qt' 'qwt') +makedepends=('mesa' 'glu') source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch) sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 2851ae69c..106458f31 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170982 2012-11-14 13:51:56Z juergen $ +# $Id: PKGBUILD 171078 2012-11-16 14:24:00Z allan $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> @@ -6,13 +6,13 @@ pkgname=sbcl pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" arch=('i686' 'x86_64') license=('custom') -depends=('glibc') -provides=('common-lisp' 'cl-asdf' 'zlib') +depends=('glibc' 'zlib') +provides=('common-lisp' 'cl-asdf') makedepends=('sbcl' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 2b6055168..8c1872313 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169982 2012-10-30 23:00:16Z heftig $ +# $Id: PKGBUILD 171076 2012-11-16 14:05:41Z allan $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -21,13 +21,13 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'slim.service' 'session-name.patch' 'libpng-1.4+-support.patch' - 'fix-glibc-segfault-1.3.4.patch') + 'fix-array-overflow.patch') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../session-name.patch # FS#26693: fix default session name patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build - patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864 + patch -Np0 -i ../fix-array-overflow.patch # FS#30864 cd ${srcdir} mkdir build cd build diff --git a/extra/slim/fix-array-overflow.patch b/extra/slim/fix-array-overflow.patch new file mode 100644 index 000000000..b035f8a78 --- /dev/null +++ b/extra/slim/fix-array-overflow.patch @@ -0,0 +1,13 @@ +Index: app.cpp +=================================================================== +--- app.cpp (revision 223) ++++ app.cpp (working copy) +@@ -593,7 +593,7 @@ + + n++; + +- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); ++ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); + memcpy(child_env, old_env, sizeof(char*)*n); + child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); + child_env[n] = NULL; diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD index 438630e95..80c2007e6 100644 --- a/extra/sound-juicer/PKGBUILD +++ b/extra/sound-juicer/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 156966 2012-04-23 09:10:13Z ibiru $ +# $Id: PKGBUILD 171308 2012-11-17 04:45:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=sound-juicer -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="A cd ripper application" arch=(i686 x86_64) -license=('GPL') -depends=('libmusicbrainz4' 'libdiscid' 'gtk3' 'gstreamer0.10-base-plugins' - 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') +license=(GPL) +depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero + hicolor-icon-theme gconf) +makedepends=(intltool gnome-doc-utils) options=(!emptydirs) url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -groups=('gnome-extra') +groups=(gnome-extra) install=sound-juicer.install -sha256sums=('49805cc73617e745ee09b62fec46979387e5713d39e5f75320b91ee8f0c44f12') +sha256sums=('ea76703e08e67590af7b8ce5206c343eb01d77cd5023c0bc958a0c2f5a98d2e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 72ef550a8..13b62fca3 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169045 2012-10-17 10:21:29Z allan $ +# $Id: PKGBUILD 171248 2012-11-16 22:37:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') -pkgver=1.3.11 -pkgrel=2 +pkgver=1.3.12 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('GPL') 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=('081fde89686ee15a9433c0035f5faed0' - '470964eb627af31f2aff9967a4b9a5bb') +md5sums=('0775647e1c34ef25364de3c178a4ed36' + '1aa2246047b424e2d23473749368b8c6') build() { cd "${srcdir}"/${pkgbase}-${pkgver} @@ -65,6 +65,12 @@ package_system-config-printer-common() { install -m644 dbus/com.redhat.NewPrinterNotification.conf \ dbus/com.redhat.PrinterDriversInstaller.conf \ "${pkgdir}"/etc/dbus-1/system.d/ + + install -d "${pkgdir}"/usr/share/dbus-1/{services,interfaces} + install -m644 dbus/org.fedoraproject.Config.Printing.service \ + "${pkgdir}"/usr/share/dbus-1/services/ + install -m644 dbus/org.fedoraproject.Config.Printing.xml \ + "${pkgdir}"/usr/share/dbus-1/interfaces/ install -d "${pkgdir}"/etc/cupshelpers/ install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ @@ -104,5 +110,6 @@ package_system-config-printer-gnome() { rm -r "${pkgdir}"/etc/dbus-1/ rm -r "${pkgdir}"/etc/cupshelpers/ rm -r "${pkgdir}"/etc/udev/ + rm -r "${pkgdir}"/usr/share/dbus-1/ rm -r "${pkgdir}"/usr/lib/ } diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 11aa6e63c..5df4e5930 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171036 2012-11-15 17:58:32Z ibiru $ +# $Id: PKGBUILD 171097 2012-11-16 17:07:10Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.13 +pkgver=0.1.14 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64') @@ -14,9 +14,8 @@ license=('LGPL') depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install -options=(!makeflags) source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a82a6f15bf12e21285e6a36256c2bde0') +md5sums=('c292c54aa08f61544ab53fda880d861c') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 0aa561c13..9a3e23e20 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 163541 2012-07-15 10:41:34Z andrea $ +# $Id: PKGBUILD 171095 2012-11-16 16:58:51Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt' 'telepathy-farstream') +depends=('qt' 'telepathy-glib') +#depends=('qt' 'telepathy-farstream') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD index b28012cc6..5c998e4df 100644 --- a/extra/telepathy-salut/PKGBUILD +++ b/extra/telepathy-salut/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 156984 2012-04-23 09:10:36Z ibiru $ +# $Id: PKGBUILD 171114 2012-11-16 17:14:40Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> pkgname=telepathy-salut -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="A link-local XMPP connection manager for Telepathy" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL') -depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3') +depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3' 'util-linux') makedepends=('libxslt' 'python2' 'xmldiff') install=telepathy-salut.install options=(!libtool) source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('43639c23de33e8466540de02816d23bf') +md5sums=('7516e6f6fa56a61054413a03642b938d') build() { cd "$pkgname-$pkgver" diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index e714c01d7..6ac86d93f 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170110 2012-11-02 09:09:21Z giovanni $ +# $Id: PKGBUILD 171268 2012-11-16 23:35:53Z ibiru $ # 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.4 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 62dfb906d..992c14846 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 148966 2012-02-05 11:58:12Z ibiru $ +# $Id: PKGBUILD 171304 2012-11-17 03:08:29Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk pkgver=2.8.12.1 -pkgrel=3 +pkgrel=4 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') +depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm' 'sdl') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa' 'glu' 'libxt') #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') @@ -20,7 +20,7 @@ build() { ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers + --with-sdl --disable-precomp-headers make make -C locale allmo cd contrib/src diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 4c986ee9c..f4a242d4b 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163164 2012-07-08 09:35:20Z ibiru $ +# $Id: PKGBUILD 171269 2012-11-16 23:35:55Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20120705 +pkgver=20121113 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) -md5sums=('81e5bec5d5774a4a3f567f14bd94289c') +md5sums=('c37851c8534ef5d7b1935145f8f5a725') build() { cd "$pkgname-snapshot-$pkgver-2245-stable" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 239d5a1b0..6699cf306 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169469 2012-10-21 18:59:02Z andyrtr $ +# $Id: PKGBUILD 171096 2012-11-16 17:03:26Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.12 +pkgver=2.20.13 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c') +sha256sums=('0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index faaef3fa9..026657181 100644 --- a/extra/xmms/PKGBUILD +++ b/extra/xmms/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170551 2012-11-08 15:28:46Z heftig $ +# $Id: PKGBUILD 171126 2012-11-16 19:24:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xmms pkgver=1.2.11 -pkgrel=5 +pkgrel=6 pkgdesc="The X MultiMedia System - a multimedia player" arch=('i686' 'x86_64') url="http://legacy.xmms2.org/" @@ -19,7 +19,7 @@ install=xmms.install source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \ xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \ xmms-1.2.11-CVE-2007-0653.0654.patch xmms-1.2.11-fix-http-title-mpg123.patch \ - xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch \ + xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch xmms-1.2.11-fix-mikmod-driver.patch \ xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png) sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' '27fb6e21bd6db923a425a8df8bd07a2a93867ddb' @@ -29,6 +29,7 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5' '6f6db13c780ba4cbddb8613f0abd2db2823f3021' '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92' + '155e11b344af1ba594b4e339640bcca37c8909af' '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3' '0089d11aa3bce67f3496592d68ee65837406e220' 'f24071ae484d9b55e61dba076801fa8e7976ff2f' @@ -49,6 +50,7 @@ build() { patch -p1 < ../xmms-1.2.11-3dse.patch patch -p1 < ../xmms-1.2.10-fonts.patch patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch + patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch if [ "$CARCH" == "i686" ]; then SIMDOPT="--enable-simd" diff --git a/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch new file mode 100644 index 000000000..c2d1b4c77 --- /dev/null +++ b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch @@ -0,0 +1,20 @@ +--- a/Input/mikmod/drv_xmms.c 2003-05-19 23:22:06.000000000 +0200 ++++ b/Input/mikmod/drv_xmms.c 2012-11-16 18:52:41.264644767 +0100 +@@ -117,6 +117,10 @@ + return VC_Init(); + } + ++static void xmms_CommandLine(CHAR * commandLine) ++{ ++} ++ + MDRIVER drv_xmms = + { + NULL, +@@ -126,5 +130,6 @@ + "xmms", + NULL, + #endif ++ xmms_CommandLine, // Was missing + xmms_IsThere, + VC_SampleLoad, |