Merge remote-tracking branch 'x/master'
* x/master: memtest86+: fixed grub image detection. memtest86+: update to 4.20. libvorbis: update to 1.3.3.
This commit is contained in:
commit
252c78aba7
|
@ -5,8 +5,6 @@ long_desc="${long_desc}
|
|||
|
||||
This package contains files for development, headers, static libs, etc."
|
||||
|
||||
revision=1
|
||||
|
||||
Add_dependency run libogg-devel
|
||||
Add_dependency run libvorbis
|
||||
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
# Template file for 'libvorbis'.
|
||||
pkgname=libvorbis
|
||||
version=1.3.2
|
||||
revision=2
|
||||
version=1.3.3
|
||||
homepage="http://www.xiph.org/vorbis/"
|
||||
distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
|
||||
build_style=gnu-configure
|
||||
short_desc="The Vorbis General Audio Compression Codec"
|
||||
maintainer="pancake <pancake@nopcode.org>"
|
||||
checksum=eeb4dcada143846dfba760d982954a02f82e08845cbc33871f5dac547b8b6124
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="BSD"
|
||||
checksum=6d747efe7ac4ad249bf711527882cef79fb61d9194c45b5ca5498aa60f290762
|
||||
long_desc="
|
||||
Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
|
||||
general-purpose compressed audio format for audio and music at fixed
|
||||
|
|
|
@ -9,8 +9,8 @@ fi
|
|||
|
||||
. /usr/lib/grub/grub-mkconfig_lib
|
||||
|
||||
if test -e /boot/memtest86+.bin ; then
|
||||
MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
|
||||
if test -e /boot/memtest86+ ; then
|
||||
MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
|
||||
echo "Found memtest86+ image: $MEMTESTPATH" >&2
|
||||
cat << EOF
|
||||
menuentry "Memory test (memtest86+)" {
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
# Template file for 'memtest86+'
|
||||
pkgname=memtest86+
|
||||
version=4.00
|
||||
version=4.20
|
||||
revision=1
|
||||
homepage="http://www.memtest.org"
|
||||
distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz"
|
||||
short_desc="An Advanced Memory Diagnostic Tool"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=6ec42f549da81b715bfc5c55b93b74774fb5c35f7578c7eecebab3ca37866ca4
|
||||
license="GPL-2"
|
||||
checksum=5630ce978d0e6b671891df4253fc5c54659764d0cdfc7515ac0df3d8dd9e8737
|
||||
long_desc="
|
||||
Memtest86+ scans your RAM for errors.
|
||||
|
||||
|
@ -22,13 +25,11 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then
|
|||
Add_dependency build gcc-multilib
|
||||
fi
|
||||
|
||||
do_build()
|
||||
{
|
||||
do_build() {
|
||||
make ${makejobs}
|
||||
}
|
||||
|
||||
do_install()
|
||||
{
|
||||
do_install() {
|
||||
vinstall memtest.bin 755 boot memtest86+
|
||||
vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user