diff options
Diffstat (limited to 'community')
| -rw-r--r-- | community/duff/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/flickcurl/PKGBUILD | 25 | ||||
| -rw-r--r-- | community/nginx/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/pcsc-tools/PKGBUILD | 18 | ||||
| -rwxr-xr-x | community/pragha/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/rawstudio/PKGBUILD | 31 | ||||
| -rw-r--r-- | community/rawstudio/rawstudio.install | 6 | ||||
| -rw-r--r-- | community/ruby-gtk2/PKGBUILD | 15 | ||||
| -rw-r--r-- | community/ruby-gtk2/mkmf-gnome2.patch | 50 | ||||
| -rw-r--r-- | community/subtle/PKGBUILD | 5 | ||||
| -rw-r--r-- | community/subtle/subtle.install | 7 | ||||
| -rw-r--r-- | community/swi-prolog/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/tomoyo-tools/PKGBUILD | 29 | ||||
| -rw-r--r-- | community/tomoyo-tools/tomoyo-tools.install | 11 | ||||
| -rw-r--r-- | community/udunits/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/unpaper/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/virtualbox/18-system-xorg.patch | 277 | ||||
| -rw-r--r-- | community/virtualbox/PKGBUILD | 18 |
18 files changed, 463 insertions, 82 deletions
diff --git a/community/duff/PKGBUILD b/community/duff/PKGBUILD index c1bb2e2cc..c97271ca7 100644 --- a/community/duff/PKGBUILD +++ b/community/duff/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 11210 2010-02-07 18:33:36Z dgriffiths $ +# $Id: PKGBUILD 44930 2011-04-13 03:50:28Z shusmann $ # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duff -pkgver=0.4 -pkgrel=3 +pkgver=0.5 +pkgrel=1 pkgdesc="A command-line utility for quickly finding duplicates in a given set of files" arch=('i686' 'x86_64') url="http://duff.sourceforge.net/" -license=('ZLIB') -depends=('glibc') +license=('custom') +depends=('glibc' 'sh') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('ca5043ceb1e16dac1aca5da1ed844149') +md5sums=('e42bedb278ab41081df3ebb9ce1cbe1d') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD new file mode 100644 index 000000000..47e29d560 --- /dev/null +++ b/community/flickcurl/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 44887 2011-04-12 12:28:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=flickcurl +pkgver=1.21 +pkgrel=1 +pkgdesc="C library for the Flickr API" +arch=(i686 x86_64) +url="http://librdf.org/flickcurl/" +license=('GPL') +depends=(raptor) +makedepends=() +source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz) +md5sums=('d4d364231505dc22a6af42be7bc85edf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 81e4dffd8..8c1becc67 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44016 2011-04-01 16:48:13Z spupykin $ +# $Id: PKGBUILD 44862 2011-04-12 10:26:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,8 +11,8 @@ _user=http _group=http pkgname=nginx -pkgver=0.8.54 -pkgrel=3 +pkgver=1.0.0 +pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('44df4eb6a22d725021288c570789046f' +md5sums=('5751c920c266ea5bb5fc38af77e9c71c' '837b010afcbdfe82d8e65ef00c4e14ba') build() { diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD index 45bd7c450..8bfabddba 100644 --- a/community/pcsc-tools/PKGBUILD +++ b/community/pcsc-tools/PKGBUILD @@ -1,19 +1,16 @@ -# $Id: PKGBUILD 37124 2011-01-11 10:36:50Z giovanni $ +# $Id: PKGBUILD 44872 2011-04-12 10:42:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-tools pkgver=1.4.17 -pkgrel=2 +pkgrel=4 pkgdesc="PC/SC Architecture smartcard tools" arch=('i686' 'x86_64') url="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/" license=('GPL') -depends=('pcsclite' 'perl') -optdepends=('gtk2-perl: required by gscriptor' - 'glib-perl: required by gscriptor' - 'pcsc-perl: required by gscriptor and scriptor') +depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl') makedepends=('pkgconfig') source=(http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('2767238e1e737f94d13a91bdab1174ca') @@ -22,6 +19,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile - make || return 1 - make DESTDIR="${pkgdir}/usr" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/usr" install } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 6d8f520cb..61ae12e91 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42505 2011-03-17 12:01:45Z ttopper $ +# $Id: PKGBUILD 44895 2011-04-12 14:24:48Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.94.0 +pkgver=0.94.1 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('985947e7066827183a9ed6eea527dffc89acc549') +sha1sums=('ea7b8554028f9df3f1a001ca278edbb8cda37fb7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index 06730f73a..7164c77d2 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 40356 2011-02-23 08:05:16Z ebelanger $ +# $Id: PKGBUILD 44889 2011-04-12 12:28:53Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: cdhotfire <cdhotfire@gmail.com> pkgname=rawstudio -pkgver=1.2 -pkgrel=6 +pkgver=2.0 +pkgrel=1 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64') license=('GPL') url="http://rawstudio.org/" -depends=('gconf' 'libxml2' 'lcms' 'libjpeg' 'libtiff' 'desktop-file-utils' 'exiv2') +depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' + 'raptor' 'lcms') install=${pkgname}.install -source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz - 'rawstudio-const.patch') -md5sums=('25399cd80294fa44220a8940fc77689f' '6692b460e838ea56462aff7626b2dcef') -sha1sums=('9ce96c40e0b8feaf4627c14310646782578d4da1' '95d83914d5ae156f0fe747945516ae6cc93adac5') +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/rawstudio-const.patch" - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins } diff --git a/community/rawstudio/rawstudio.install b/community/rawstudio/rawstudio.install index 5e5cfef4d..261adb7b4 100644 --- a/community/rawstudio/rawstudio.install +++ b/community/rawstudio/rawstudio.install @@ -1,11 +1,11 @@ post_install() { - update-desktop-database -q + update-desktop-database -q || true } post_upgrade() { - post_install $1 + update-desktop-database -q || true } post_remove() { - update-desktop-database -q + update-desktop-database -q || true } diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 0d50843f3..b796f8416 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 44834 2011-04-12 02:45:00Z bfanella $ +# $Id: PKGBUILD 44925 2011-04-13 00:53:43Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> pkgname=ruby-gtk2 pkgver=0.90.8 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby bindings for gtk2." arch=('i686' 'x86_64') url="http://ruby-gnome2.sourceforge.jp" license=('LGPL') depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2') makedepends=('ruby-pkgconfig' 'ruby-cairo') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('74966bde5366bc9d09701e9f464d60c9') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz + 'mkmf-gnome2.patch') +md5sums=('74966bde5366bc9d09701e9f464d60c9' + '5674ec349bec878c36f70102ca7acb0b') build() { cd "$srcdir/ruby-gtk2-$pkgver" + + # Apply mkmf-gnome2.patch + patch -Np1 glib2/lib/mkmf-gnome2.rb < ${srcdir}/mkmf-gnome2.patch + + export LANG="en_US.UTF-8" ruby extconf.rb gtk2 --topdir=$pkgdir make } diff --git a/community/ruby-gtk2/mkmf-gnome2.patch b/community/ruby-gtk2/mkmf-gnome2.patch index a03ab9e4c..bf877cf9c 100644 --- a/community/ruby-gtk2/mkmf-gnome2.patch +++ b/community/ruby-gtk2/mkmf-gnome2.patch @@ -1,19 +1,31 @@ -*** mkmf-gnome2.rb.orig 2011-02-21 12:41:16.563334382 -0600 ---- mkmf-gnome2.rb 2011-02-21 12:41:37.610001048 -0600 -*************** -*** 364,370 **** - rescue LoadError - end - end -! return false if rcairo_source_dir.nil? - - if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM - options = {} ---- 364,370 ---- - rescue LoadError - end - end -! return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h')) - - if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM - options = {} +--- glib2/lib/mkmf-gnome2.rb.orig 2011-04-12 14:51:53.223390976 +0200 ++++ glib2/lib/mkmf-gnome2.rb 2011-04-12 14:52:21.240120725 +0200 +@@ -366,20 +366,19 @@ + rescue LoadError + end + end ++ return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h')) + +- unless rcairo_source_dir.nil? +- if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM +- options = {} +- build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}" +- if File.exist?(File.join(rcairo_source_dir, build_dir)) +- options[:target_build_dir] = build_dir +- end +- add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options) +- $defs << "-DRUBY_CAIRO_PLATFORM_WIN32" ++ if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM ++ options = {} ++ build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}" ++ if File.exist?(File.join(rcairo_source_dir, build_dir)) ++ options[:target_build_dir] = build_dir + end +- $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" ++ add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options) ++ $defs << "-DRUBY_CAIRO_PLATFORM_WIN32" + end + ++ $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" + PKGConfig.have_package('cairo') and have_header('rb_cairo.h') + end diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index 247479027..268736beb 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44650 2011-04-10 13:39:02Z angvp $ +# $Id: PKGBUILD 44915 2011-04-12 21:25:17Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: unexist <unexist@dorfelite.net> # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com> pkgname=subtle pkgver=0.9.2773 -pkgrel=1 +pkgrel=2 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel" arch=("i686" "x86_64") url="http://subtle.subforge.org" @@ -16,6 +16,7 @@ conflicts=("subtle-hg") backup=("etc/xdg/subtle/subtle.rb") source=(http://subforge.org/attachments/download/50/$pkgname-$pkgver-mu.tbz2) md5sums=('bbae53d6c16cfe25186003e9e28504f8') +install=subtle.install build() { cd "$srcdir/$pkgname-$pkgver-mu" diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install index c7ef727b7..36fa9bafe 100644 --- a/community/subtle/subtle.install +++ b/community/subtle/subtle.install @@ -1,3 +1,8 @@ post_upgrade() { - echo "If you have subtles on your system remember to upgrade them doing:\n\n\t sur upgrade " + echo "In order to use sur you have to install the following dependencies: curb and minitar with" + echo "You can use this gem command: " + echo " gem install curb minitar" + echo "" + echo "If you have subtles on your system remember to upgrade them doing:" + echo " sur upgrade " } diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 007441a52..9e0faf6f9 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=swi-prolog -pkgver=5.10.2 -pkgrel=2 +pkgver=5.10.4 +pkgrel=1 pkgdesc='Prolog environment' arch=('i686' 'x86_64') url='http://www.swi-prolog.org/' @@ -18,7 +18,7 @@ optdepends=('unixodbc: for using the odbc4pl library' 'libxft: for using the pl2xpce library') options=('!makeflags') source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz") -md5sums=('7973bcfd3854ae0cb647cc62f2faabcf') +md5sums=('363433bb2f80a6c2befeaee7768197b4') build() { cd pl-${pkgver} diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD new file mode 100644 index 000000000..ceda8d708 --- /dev/null +++ b/community/tomoyo-tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 44878 2011-04-12 10:45:41Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> + +pkgname=tomoyo-tools +_basever=2.3.0 +_timestamp=20110211 +pkgver=${_basever}.${_timestamp} +pkgrel=4 +pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later' +arch=('i686' 'x86_64') +url='http://tomoyo.sourceforge.jp' +license=('GPL') +depends=('ncurses') +makedepends=('help2man') +conflicts=('ccs-tools') +install=tomoyo-tools.install +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('000015f85fe9aa814196d5a981fab5b6') + +build() { + cd "${srcdir}/${pkgname}" + make -j1 +} + +package() { + cd "${srcdir}/${pkgname}" + make INSTALLDIR="${pkgdir}" install +} diff --git a/community/tomoyo-tools/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install new file mode 100644 index 000000000..6fb5e16d2 --- /dev/null +++ b/community/tomoyo-tools/tomoyo-tools.install @@ -0,0 +1,11 @@ +post_install () { + echo + echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel" + echo " boot options and initialize policy with this command:" + echo " /usr/lib/tomoyo/init_policy" + echo +} + +post_upgrade () { + post_install $1 +} diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD index 6e9bc02e5..b1d7240a4 100644 --- a/community/udunits/PKGBUILD +++ b/community/udunits/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 44587 2011-04-09 04:53:44Z kchen $ +# $Id: PKGBUILD 44910 2011-04-12 18:07:39Z kchen $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> pkgname=udunits pkgver=2.1.22 -pkgrel=1 +pkgrel=2 pkgdesc='A tool for calculations of physical quantities' arch=('i686' 'x86_64') url='http://www.unidata.ucar.edu/software/udunits/' license=('custom') options=('!libtool') -depends=('glibc') +depends=('glibc' 'expat') provides=('udunits2') install=udunits.install source=("ftp://ftp.unidata.ucar.edu/pub/$pkgname/$pkgname-$pkgver.tar.gz") diff --git a/community/unpaper/PKGBUILD b/community/unpaper/PKGBUILD index ea0e42e87..0a854130e 100644 --- a/community/unpaper/PKGBUILD +++ b/community/unpaper/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 21219 2010-07-15 09:47:52Z spupykin $ +# $Id: PKGBUILD 44854 2011-04-12 08:56:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> pkgname=unpaper pkgver=0.3 -pkgrel=1 +pkgrel=2 pkgdesc="post-processing tool for scanned sheets of paper" +arch=('i686' 'x86_64') url="http://$pkgname.berlios.de/" license="GPL" depends=() -arch=('i686' 'x86_64') -makedepends=(gcc) +makedepends=('gcc') source=("http://download.berlios.de/unpaper/$pkgname-${pkgver}.tar.gz") md5sums=('be41eaf8556e7df39ab53939c99c4f7b') @@ -18,4 +18,6 @@ build() { cd $srcdir/$pkgname-$pkgver/src gcc $CFLAGS -lm -funroll-all-loops -fomit-frame-pointer -ftree-vectorize -o unpaper unpaper.c install -D -m0755 unpaper $pkgdir/usr/bin/unpaper + install -d -m0755 $pkgdir/usr/share/doc/unpaper + cp -a ../doc/* $pkgdir/usr/share/doc/unpaper } diff --git a/community/virtualbox/18-system-xorg.patch b/community/virtualbox/18-system-xorg.patch new file mode 100644 index 000000000..4a28b93b6 --- /dev/null +++ b/community/virtualbox/18-system-xorg.patch @@ -0,0 +1,277 @@ +Description: Build the X.Org driver only for the selected system X Server version. +Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de> + +diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ++++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +@@ -40,8 +40,8 @@ LIBRARIES += \ + VBoxGuestR3LibShared + ifndef VBOX_ONLY_TESTSUITE + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 ++# LIBRARIES += \ ++# VBoxGuestR3LibXFree86 + endif + endif + LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 +diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk +--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL + VBoxOGL_INCS = . + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_INCS += \ +- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ +- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ +- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ +- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ +- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ +- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ +- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ +- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(VBOX_MESA_INCS) \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 ++ /usr/include/drm \ ++ /usr/include/libdrm + VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + +diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk +--- a/src/VBox/Additions/x11/Makefile.kmk ++++ b/src/VBox/Additions/x11/Makefile.kmk +@@ -17,6 +17,10 @@ + SUB_DEPTH = ../../../.. + include $(KBUILD_PATH)/subheader.kmk + ++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) ++ XSERVER_VERSION := 17 ++endif ++ + # Include sub-makefiles. + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk +diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxmouse_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxmouse_drv + vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxmouse_drv_DEFS.linux = linux + vboxmouse_drv_DEFS.x86 += __i386__ +@@ -59,7 +58,6 @@ endif + # + # vboxmouse_drv_70 + # +-DLLS += vboxmouse_drv_70 + vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_70_DEFS = \ + XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE +@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ + # + # vboxmouse_drv_71 + # +-DLLS += vboxmouse_drv_71 + vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) + vboxmouse_drv_71_INCS := \ +@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ + # + # vboxmouse_drv_13 + # +-DLLS += vboxmouse_drv_13 + vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_13_INCS := \ +@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ + # + # vboxmouse_drv_14 + # +-DLLS += vboxmouse_drv_14 + vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_14_INCS := \ +@@ -126,7 +121,6 @@ endif + # + # vboxmouse_drv_15 + # +-DLLS += vboxmouse_drv_15 + vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_15_INCS := \ +@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ + # + # vboxmouse_drv_16 + # +-DLLS += vboxmouse_drv_16 + vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_16_INCS := \ +@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ + # + # vboxmouse_drv_17 + # +-DLLS += vboxmouse_drv_17 + vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ + # + # vboxmouse_drv_18 + # +-DLLS += vboxmouse_drv_18 + vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ + # + # vboxmouse_drv_19 + # +-DLLS += vboxmouse_drv_19 + vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ + # + # vboxmouse_drv_110 + # +-DLLS += vboxmouse_drv_110 + vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ + vboxmouse_15.c + + ++vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv ++vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 ++DLLS += vboxmouse_drv_$(XSERVER_VERSION) ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES +diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk + # vboxvideo_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxvideo_drv + endif # target linux + vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxvideo_drv_DEFS.linux = linux +@@ -89,7 +88,6 @@ endif # target linux + # base keywords instead of using .solaris or .linux. + # Also it is *important* to use := and not = when deriving a property. + # +-DLLS += vboxvideo_drv_70 + vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + if1of ($(KBUILD_TARGET), linux) + vboxvideo_drv_70_CFLAGS += \ +@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_71 + # +-DLLS += vboxvideo_drv_71 + vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) +@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) + # + # vboxvideo_drv_13 + # +-DLLS += vboxvideo_drv_13 + vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 +@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ + # + # vboxvideo_drv_14 + # +-DLLS += vboxvideo_drv_14 + vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) +@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) + # + # vboxvideo_drv_15 + # +-DLLS += vboxvideo_drv_15 + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ +@@ -192,7 +186,6 @@ endif + # + # vboxvideo_drv_16 + # +-DLLS += vboxvideo_drv_16 + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_17 + # +-DLLS += vboxvideo_drv_17 + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_18 + # +-DLLS += vboxvideo_drv_18 + vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_19 + # +-DLLS += vboxvideo_drv_19 + vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) + # + # vboxvideo_drv_110 + # +-DLLS += vboxvideo_drv_110 + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ + vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) + + ++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv ++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ ++ /usr/include/xorg \ ++ /usr/include/x11 \ ++ /usr/include/pixman-1 \ ++ /usr/include/X11/dri \ ++ /usr/include/drm \ ++ /usr/include/libdrm ++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include ++DLLS += vboxvideo_drv_$(XSERVER_VERSION) ++ ++# required for lenny backports ++ifeq ($(XSERVER_VERSION),14) ++ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg ++endif ++ ++ + # Check the undefined symbols in the X.Org modules against lists of allowed + # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 6191165c1..94a9aba4f 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 42565 2011-03-17 13:26:20Z ibiru $ +# $Id: PKGBUILD 44881 2011-04-12 11:57:31Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2') +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh) + 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh + 18-system-xorg.patch) _kernver=2.6.38-ARCH build() { @@ -22,6 +24,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" + patch -Np1 -i "$srcdir/18-system-xorg.patch" cp "$srcdir/LocalConfig.kmk" . @@ -160,9 +163,9 @@ package_virtualbox-guest-additions(){ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv_19.so \ + install -D vboxmouse_drv.so \ "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv_19.so \ + install -D vboxvideo_drv.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" @@ -207,4 +210,5 @@ md5sums=('b4770ca14d1a8cbad9b3eb0e0028ff4b' 'ed1341881437455d9735875ddf455fbe' '94514e006e73cc2fa90259a4e0eec04b' '0f3f273cdbc54db221f737ad4f761c11' - '47da2e88de582bb2bab14580a3aa47b1') + '47da2e88de582bb2bab14580a3aa47b1' + '8a22b33c9dfaf8fb79bb2d26304e650b') |