Merge remote-tracking branch 'dave/master'

* dave/master:
  dssi-vst: submit pkg to the new rshlibs world order (NRWO).
  wine: submit pkg to the new rshlibs world order (NRWO).
  virtualbox-ose: Update due to modified tarball (idiots); add i686 rshlib glibc; revbump
  pcmanfm: make libm SONAME x86_64 specific.
  openobex: convert to the new rshlibs world order.
  adobe-flash-plugin: Update to 11.1.102.55 for i686
This commit is contained in:
Juan RP 2011-11-17 08:15:37 +01:00
commit 1759b92bd5
19 changed files with 51 additions and 35 deletions

View file

@ -27,3 +27,4 @@ libdl.so.2
libm.so.6 libm.so.6
libc.so.6 libc.so.6
ld-linux-x86-64.so.2 ld-linux-x86-64.so.2
ld-linux.so.2

View file

@ -10,8 +10,7 @@ if [ "$XBPS_MACHINE" = "x86_64" ]; then
_distcksum=345818f97e4d2e974a70d7f5bcd6a0131304f8ec2ef91eed1de2931376a35c27 _distcksum=345818f97e4d2e974a70d7f5bcd6a0131304f8ec2ef91eed1de2931376a35c27
else else
_disttarball="${_url}/install_flash_player_11_linux.i386.tar.gz" _disttarball="${_url}/install_flash_player_11_linux.i386.tar.gz"
# XXX FIXME update for 11.1.102.55 _distcksum=678e2270cb12821b3685af22428e1122b2d130bc8f12ecc714d3636a00b5ed23
_distcksum=3532ee49eda0845597084a805e11985f9fd9c5f7b5b72f592ceb18529da918c1
fi fi
distfiles="${_eula} ${_disttarball}" distfiles="${_eula} ${_disttarball}"
checksum="${_eulacksum} ${_distcksum}" checksum="${_eulacksum} ${_distcksum}"

View file

@ -0,0 +1,9 @@
libjack.so.0
libasound.so.2
libpthread.so.0
libstdc++.so.6
libm.so.6
libgcc_s.so.1
libc.so.6
liblo.so.7
libwine.so.1

View file

@ -1,7 +1,7 @@
# Template file for 'dssi-vst' # Template file for 'dssi-vst'
pkgname=dssi-vst pkgname=dssi-vst
version=0.9.2 version=0.9.2
revision=1 revision=2
homepage="http://breakfastquay.com/dssi-vst/" homepage="http://breakfastquay.com/dssi-vst/"
distfiles="http://code.breakfastquay.com/attachments/download/10/${pkgname}-${version}.tar.bz2" distfiles="http://code.breakfastquay.com/attachments/download/10/${pkgname}-${version}.tar.bz2"
short_desc="Run Windows VST plugins on Linux" short_desc="Run Windows VST plugins on Linux"
@ -17,11 +17,6 @@ long_desc="
only_for_archs=i686 only_for_archs=i686
Add_dependency run glibc
Add_dependency run libjack
Add_dependency run alsa-lib
Add_dependency run libgcc
Add_dependency run liblo
Add_dependency run dssi Add_dependency run dssi
Add_dependency run ladspa-sdk Add_dependency run ladspa-sdk
Add_dependency run ladspa-sdk-progs Add_dependency run ladspa-sdk-progs

View file

@ -1 +1,2 @@
libc.so.6 libc.so.6
libusb-0.1.so.4

View file

@ -5,9 +5,8 @@ long_desc="${long_desc}
This package contains the shared library provided by openobex." This package contains the shared library provided by openobex."
revision=3 revision=4
Add_dependency run libusb-compat
do_install() do_install()
{ {

View file

@ -1,2 +1,3 @@
libopenobex.so.1 libopenobex.so.1
libc.so.6 libc.so.6
libbluetooth.so.3

View file

@ -1,7 +1,7 @@
# Template file for 'openobex' # Template file for 'openobex'
pkgname=openobex pkgname=openobex
version=1.5 version=1.5
revision=2 revision=3
distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb" configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb"
@ -20,6 +20,5 @@ long_desc="
subpackages="libopenobex libopenobex-devel" subpackages="libopenobex libopenobex-devel"
Add_dependency run libusb-compat Add_dependency run libusb-compat
Add_dependency run libbluetooth
Add_dependency build libusb-compat-devel Add_dependency build libusb-compat-devel
Add_dependency build libbluetooth-devel Add_dependency build libbluetooth-devel

View file

@ -11,4 +11,4 @@ libgobject-2.0.so.0
libglib-2.0.so.0 libglib-2.0.so.0
libpthread.so.0 libpthread.so.0
libc.so.6 libc.so.6
libm.so.6 libm.so.6 x86_64

View file

@ -3,7 +3,7 @@ pkgname=pcmanfm
version=0.9.9 version=0.9.9
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu-configure build_style=gnu-configure
revision=2 revision=3
short_desc="LXDE file manager" short_desc="LXDE file manager"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c checksum=bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c

View file

@ -2,7 +2,7 @@
pkgname=virtualbox-ose pkgname=virtualbox-ose
_vbox_distver=4.1.6 _vbox_distver=4.1.6
version=${_vbox_distver} version=${_vbox_distver}
revision=3 revision=4
patch_args="-Np1" patch_args="-Np1"
wrksrc="VirtualBox-${version}_OSE" wrksrc="VirtualBox-${version}_OSE"
distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
@ -10,7 +10,7 @@ short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virtualbox.org" homepage="http://virtualbox.org"
license="GPL-2, MPL-1.1, CDDL" license="GPL-2, MPL-1.1, CDDL"
checksum=7acbb75f8314ea56601db36ac8a52b4aa6eabae65a3d6e95e66f6450883d8818 checksum=554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
long_desc=" long_desc="
VirtualBox is a free x86 virtualization solution allowing a wide range of x86 VirtualBox is a free x86 virtualization solution allowing a wide range of x86
operating systems such as Windows, DOS, BSD or Linux to run on a Linux system." operating systems such as Windows, DOS, BSD or Linux to run on a Linux system."

View file

@ -8,6 +8,8 @@ long_desc="${long_desc}
use of these modules. Kernel sources or headers are required to compile this use of these modules. Kernel sources or headers are required to compile this
module." module."
revision=1
dkms_modules="virtualbox-ose ${_vbox_distver}" dkms_modules="virtualbox-ose ${_vbox_distver}"
noarch=yes noarch=yes

View file

@ -8,6 +8,8 @@ long_desc="${long_desc}
order to make use of these modules. Kernel sources or headers are required to order to make use of these modules. Kernel sources or headers are required to
compile these modules." compile these modules."
revision=1
dkms_modules="virtualbox-ose-guest ${_vbox_distver}" dkms_modules="virtualbox-ose-guest ${_vbox_distver}"
noarch=yes noarch=yes

View file

@ -8,6 +8,7 @@ libpthread.so.0
librt.so.1 librt.so.1
libc.so.6 libc.so.6
ld-linux-x86-64.so.2 ld-linux-x86-64.so.2
ld-linux.so.2
libcrypt.so.1 libcrypt.so.1
libstdc++.so.6 libstdc++.so.6
libm.so.6 libm.so.6

View file

@ -8,7 +8,7 @@ long_desc="${long_desc}
They provide closer integration and allow to share data through shared folders They provide closer integration and allow to share data through shared folders
between the host system and the virtual machine." between the host system and the virtual machine."
revision=2 revision=3
systemd_services="virtualbox-guest.service on" systemd_services="virtualbox-guest.service on"
Add_dependency run virtualbox-ose-guest-dkms ">=${version}" Add_dependency run virtualbox-ose-guest-dkms ">=${version}"

View file

@ -0,0 +1,20 @@
libdl.so.2
libc.so.6
libxml2.so.2
libm.so.6
libmpg123.so.0
libSM.so.6
libXext.so.6
libX11.so.6
libz.so.1
libGLU.so.1
libGL.so.1
libresolv.so.2
libgphoto2.so.2
libgphoto2_port.so.0
libasound.so.2
libldap_r-2.4.so.2
liblber-2.4.so.2
libpthread.so.0
libopenal.so.1
liblcms.so.1

View file

@ -5,22 +5,8 @@ long_desc="${long_desc}
This package contains the wine runtime." This package contains the wine runtime."
revision=3 revision=4
Add_dependency run glibc
Add_dependency run lcms
Add_dependency run zlib
Add_dependency run libSM
Add_dependency run libXext
Add_dependency run libX11
Add_dependency run libldap
Add_dependency run alsa-lib
Add_dependency run libgphoto2
Add_dependency run libxml2
Add_dependency run libmpg123
Add_dependency run libGL
Add_dependency run libGLU
Add_dependency run libopenal
do_install() do_install()
{ {

View file

@ -1,7 +1,7 @@
# Template file for 'wine' # Template file for 'wine'
pkgname=wine pkgname=wine
version=1.2.3 version=1.2.3
revision=2 revision=3
build_style=gnu-configure build_style=gnu-configure
homepage="http://www.winehq.org/" homepage="http://www.winehq.org/"
distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2" distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2"
@ -18,8 +18,6 @@ only_for_archs=i686
subpackages="lib$pkgname $pkgname-devel" subpackages="lib$pkgname $pkgname-devel"
gtk_iconcache_dirs="/usr/share/icons/hicolor" gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
Add_dependency run libwine
Add_dependency build lcms-devel Add_dependency build lcms-devel
Add_dependency build zlib-devel Add_dependency build zlib-devel

View file

@ -0,0 +1,3 @@
libc.so.6
libwine.so.1
libpthread.so.0