From 94fc062c671dff3129b5b951a508eb3bfa6738ed Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 14:32:24 -0500 Subject: perl-javascript: Bump to latest & fix deps; refs #383 --- abs/core/perl_modules/perl-javascript/PKGBUILD | 38 ++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/abs/core/perl_modules/perl-javascript/PKGBUILD b/abs/core/perl_modules/perl-javascript/PKGBUILD index 564e2d9..90ff7a1 100644 --- a/abs/core/perl_modules/perl-javascript/PKGBUILD +++ b/abs/core/perl_modules/perl-javascript/PKGBUILD @@ -1,23 +1,27 @@ pkgname=perl-javascript -_realname=JavaScript -pkgver=1.12 +pkgver=1.16 pkgrel=2 -pkgdesc="get name of current working directory" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~KWILLIAMS/Path-Class" - +pkgdesc="Perl extension for executing embedded JavaScript" +depends=('perl>=5.10.0' 'glibc' 'perl-test-exception' 'js' 'xulrunner' 'nspr') license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' spidermonkey) -options=('!emptydirs') +url="http://search.cpan.org/dist/JavaScript/" source=(http://search.cpan.org/CPAN/authors/id/C/CL/CLAESJAC/JavaScript-$pkgver.tar.gz) -#source=(http://search.cpan.org/CPAN/authors/id/T/TB/TBUSCH/JavaScript-SpiderMonkey-0.19.tar.gz) -groups=('shepherd-dep') -build() { - cd $startdir/src/$_realname-$pkgver - JS_INC=/usr/include/js PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 +options=('!emptydirs') +arch=(i686 x86_64) + +build() +{ + cd ${srcdir}/JavaScript-$pkgver + + # dirty hack to pass the correct includes to the script + export JS_THREADSAFE=1 JS_UTF8=1 JS_ENABLE_E4X=1 JS_INC="/usr/include/js -I/usr/include/xulrunner-1.9.2 -I/usr/include/nspr" + perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 - make install DESTDIR=$startdir/pkg || return 1 - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} + make DESTDIR=${pkgdir} install || return 1 + + # Remove .packlist and perllocal.pod files. + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name 'perllocal.pod' -delete +} +md5sums=('c3c4a744e0a5018b94f53341baa18df7') -- cgit v0.12 From 5e3fdf55324cfc3834dbf4a91f7e0192e0d748b2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 14:35:32 -0500 Subject: perl-test-exception: Initial Inclusion. dep of perl-javascript; refs #383 --- abs/core/perl_modules/perl-test-exception/PKGBUILD | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 abs/core/perl_modules/perl-test-exception/PKGBUILD diff --git a/abs/core/perl_modules/perl-test-exception/PKGBUILD b/abs/core/perl_modules/perl-test-exception/PKGBUILD new file mode 100644 index 0000000..ccf2bc6 --- /dev/null +++ b/abs/core/perl_modules/perl-test-exception/PKGBUILD @@ -0,0 +1,26 @@ +# This PKGBUILD was autocreated. See http://xtermin.us/archperl/ for details +# Maintainer: Charles Mauch + +pkgname=perl-test-exception +pkgver=0.31 +pkgrel=1 +pkgdesc="Perl/CPAN Module Test::Exception : Functions for testing exceptionbased code" +arch=("any") +url="http://search.cpan.org/~adie/" +license=("GPL" "Artistic") +makedepends=("perl-sub-uplevel") +depends=("perl-sub-uplevel") +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-$pkgver.tar.gz") +md5sums=('adb57ca7614d15e5b307bf5e024b35a8') + +build() { + cd $srcdir/Test-Exception-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} +package() { + cd $srcdir/Test-Exception-$pkgver + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} -- cgit v0.12 From 29d5baf12551c031fcd5ddd426bb27698ce634a4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 14:37:44 -0500 Subject: perl-sub-uplevel: Initial Inclusion. dep of perl-test-exception; refs #383 --- abs/core/perl_modules/perl-sub-uplevel/PKGBUILD | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 abs/core/perl_modules/perl-sub-uplevel/PKGBUILD diff --git a/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD b/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD new file mode 100644 index 0000000..4f3d53d --- /dev/null +++ b/abs/core/perl_modules/perl-sub-uplevel/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: Francois Charette + +pkgname=perl-sub-uplevel +pkgver=0.22 +pkgrel=1 +pkgdesc="apparently run a function in a higher stack frame " +arch=('any') +url="http://search.cpan.org/dist/Sub-Uplevel" +license=('GPL' 'PerlArtistic') +depends=('perl') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-$pkgver.tar.gz) +md5sums=('c166738a97c0424a0075ebe205d285db') + +build() { + cd $startdir/src/Sub-Uplevel-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make install DESTDIR=$startdir/pkg || return 1 + find $startdir/pkg -name '.packlist' -delete + find $startdir/pkg -name '*.pod' -delete +} -- cgit v0.12 From deda8d8b725dceeecd6074a5999bc5dd1b151747 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 6 Aug 2011 17:00:35 -0500 Subject: perl-javascript: still broken; upstream bugs with new js. refs #383 --- abs/core/perl_modules/perl-javascript/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/abs/core/perl_modules/perl-javascript/PKGBUILD b/abs/core/perl_modules/perl-javascript/PKGBUILD index 90ff7a1..615d90d 100644 --- a/abs/core/perl_modules/perl-javascript/PKGBUILD +++ b/abs/core/perl_modules/perl-javascript/PKGBUILD @@ -24,4 +24,5 @@ build() find ${pkgdir} -name 'perllocal.pod' -delete } + md5sums=('c3c4a744e0a5018b94f53341baa18df7') -- cgit v0.12 From bb28351257e0c04a78fc266564f78376f8ea6310 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 6 Aug 2011 22:27:15 -0500 Subject: linhes-config xconfig.sh: quick fix so nvidia works for new installs. Plan to clean this up, if not outright rewrite --- abs/core/LinHES-config/PKGBUILD | 4 +-- abs/core/LinHES-config/xconfig.sh | 54 +++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 3821d1b..4a4748d 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=27 +pkgrel=28 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -110,7 +110,7 @@ md5sums=('c737f8538aea20fcb5f3903957e80837' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' - '95526b4d3dec6c9341088fb6511d831a' + '266d48cc336c70e8967c5bb9f5e1787d' 'ecf9e5df20683a769c4a8a8f2d65de85' 'e459ed069317bccb20351f037a9df3d2' '83be9a3bc72179909773479c74d13b38' diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index fff7f44..d684c21 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -4,7 +4,15 @@ #SET DISPLAYRES to force Xres, ENV takes precendent over cmdline #displayres=cmdline #NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident" -NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome" +#NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome " +#NVPKGS="unichrome-dri" +for i in ati intel mga savage sis unichrome +do + #templist="$i-dri xf86-video-$i" + templist=`echo $i-dri xf86-video-$i` + NVPKGS=`echo $NVPKGS $templist` + +done BASE="" . /etc/profile NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt" @@ -187,28 +195,37 @@ function setupAdvancedX { esac } +function nvidia_prepare { + pacman --noconfirm -Rdd libgl > /dev/null 2>&1 + for i in `echo ${NVPKGS}` + do + echo $i + pacman --noconfirm -Rc $i + # echo pacman -R $NVPKGS + #pacman -R $NVPKGS + done + + +} + function nvidia_driver_install { cp "$TEMPLATES/xorg/xorg.conf.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf - if [ ${Xres} = Auto ] - then - nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select" - else - nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=${Xres} - fi + if [ "$TESTMODE" != "test" ] then - + grep -qi "$CARDID" "$NVIDIA_SUPPORTED" if [ $? = 0 ] then #install latest drivers echo "installing current nvidia drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + # pacman --noconfirm -Rd libgl > /dev/null 2>&1 + # pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + nvidia_prepare pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 fi @@ -219,8 +236,9 @@ function nvidia_driver_install { then #install 96xx drivers echo "installing nvidia 96xx drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 +# # pacman --noconfirm -Rd libgl > /dev/null 2>&1 +# # pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + nvidia_prepare pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 fi @@ -229,11 +247,19 @@ function nvidia_driver_install { then #install latest drivers echo "installing 173 nvidia drivers" - pacman --noconfirm -Rd libgl > /dev/null 2>&1 - pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 +# pacman --noconfirm -Rd libgl > /dev/null 2>&1 +# pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 + nvidia_prepare pacman --noconfirm -S nvidia-173xx nvidia-173xx-utils > /dev/null 2>&1 fi fi + if [ ${Xres} = Auto ] + then + nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select" + else + nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=${Xres} + fi + echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG" rm $BASE/etc/X11/xorg.conf.d/20-nvidia.conf } -- cgit v0.12