Merge remote-tracking branch 'upstream/master'
This commit is contained in:
wertyi48
commit
70bb154930
9 changed files with 12755 additions and 56 deletions
|
|
@ -1,32 +1,16 @@
|
|||
# Template file for 'chroot-xz'
|
||||
pkgname=chroot-xz
|
||||
version=5.0.4
|
||||
wrksrc="xz-${version}"
|
||||
version=5.0.5
|
||||
revision=1
|
||||
distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2"
|
||||
wrksrc="xz-${version}"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-nls --disable-shared"
|
||||
short_desc="XZ utilities -- for xbps-src use"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92
|
||||
homepage="http://tukaani.org/xz/"
|
||||
license="custom blend of Public Domain, GPL-2 and GPL-2"
|
||||
long_desc="
|
||||
LZMA is a general purporse compression algorithm designed by Igor
|
||||
Pavlov as part of 7-Zip. It provides high compression ratio while
|
||||
keeping the decompression speed fast.
|
||||
|
||||
XZ Utils are an attempt to make LZMA compression easy to use on
|
||||
free (as in freedom) operating systems. This is achieved by providing
|
||||
tools and libraries which are similar to use than the equivalents
|
||||
of the most popular existing compression algorithms.
|
||||
|
||||
XZ Utils consist of a few relatively separate parts:
|
||||
* xz command line tool has almost identical syntax than gzip
|
||||
and bzip2. It makes LZMA easy for average users, but also
|
||||
provides advanced options to finetune the compression settings.
|
||||
* A few shell scripts make diffing and grepping LZMA compressed
|
||||
files easy. The scripts were adapted from gzip and bzip2."
|
||||
distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2"
|
||||
checksum=166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490
|
||||
|
||||
bootstrap=yes
|
||||
|
||||
|
|
|
|||
1
srcpkgs/linux3.10-headers
Symbolic link
1
srcpkgs/linux3.10-headers
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
linux3.10
|
||||
6268
srcpkgs/linux3.10/files/i386-dotconfig
Normal file
6268
srcpkgs/linux3.10/files/i386-dotconfig
Normal file
File diff suppressed because it is too large
Load diff
6213
srcpkgs/linux3.10/files/x86_64-dotconfig
Normal file
6213
srcpkgs/linux3.10/files/x86_64-dotconfig
Normal file
File diff suppressed because it is too large
Load diff
223
srcpkgs/linux3.10/template
Normal file
223
srcpkgs/linux3.10/template
Normal file
|
|
@ -0,0 +1,223 @@
|
|||
# Template file for 'linux3.10'
|
||||
#
|
||||
pkgname=linux3.10
|
||||
version=3.10.0
|
||||
revision=2
|
||||
wrksrc="linux-3.10"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.kernel.org"
|
||||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (3.10 series)"
|
||||
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-3.10.tar.xz"
|
||||
checksum=df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
makedepends="bc perl kmod>=11_2 openssl which elfutils"
|
||||
_kernver="${version}_${revision}"
|
||||
|
||||
do_configure() {
|
||||
# If there's a file called <arch>-dotconfig, use it to
|
||||
# configure the kernel; otherwise use arch defaults and all stuff
|
||||
# as modules (defconfig+allmodconfig).
|
||||
local arch
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
|
||||
arch=i386
|
||||
else
|
||||
arch=x86_64
|
||||
fi
|
||||
|
||||
if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
|
||||
msg_normal "Detected a custom .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
|
||||
make ${makejobs} oldconfig
|
||||
elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig .config
|
||||
make ${makejobs} oldconfig
|
||||
else
|
||||
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
|
||||
make ${makejobs} defconfig
|
||||
make ${makejobs} allmodconfig
|
||||
fi
|
||||
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
|
||||
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs} prepare
|
||||
make ${makejobs} bzImage modules
|
||||
}
|
||||
|
||||
do_install() {
|
||||
local arch hdrdest
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
|
||||
arch=i386
|
||||
else
|
||||
arch=x86_64
|
||||
fi
|
||||
|
||||
# Run depmod after compressing modules.
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# Install kernel, firmware and modules
|
||||
make INSTALL_MOD_PATH=${DESTDIR} modules_install
|
||||
|
||||
hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
|
||||
|
||||
install -Dm644 .config ${DESTDIR}/boot/config-${_kernver}
|
||||
install -Dm644 arch/x86/boot/bzImage \
|
||||
${DESTDIR}/boot/vmlinuz-${_kernver}
|
||||
install -Dm644 System.map \
|
||||
${DESTDIR}/boot/System.map-${_kernver}
|
||||
|
||||
# Switch to /usr.
|
||||
vmkdir usr
|
||||
mv ${DESTDIR}/lib ${DESTDIR}/usr
|
||||
|
||||
cd ${DESTDIR}/usr/lib/modules/${_kernver}
|
||||
rm -f source build
|
||||
ln -sf ../../../src/kernel-headers-${_kernver} build
|
||||
|
||||
cd ${wrksrc}
|
||||
# Install required headers to build external modules
|
||||
install -Dm644 Makefile ${hdrdest}/Makefile
|
||||
install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
|
||||
install -Dm644 .config ${hdrdest}/.config
|
||||
mkdir -p ${hdrdest}/include
|
||||
# Remove firmware stuff provided by the "linux-firmware" pkg.
|
||||
rm -rf ${DESTDIR}/usr/lib/firmware
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
if [ -d include/$i ]; then
|
||||
cp -a include/$i ${hdrdest}/include
|
||||
fi
|
||||
done
|
||||
|
||||
cd ${wrksrc}
|
||||
mkdir -p ${hdrdest}/arch/x86
|
||||
cp -a arch/x86/include ${hdrdest}/arch/x86
|
||||
|
||||
# Copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${hdrdest}
|
||||
cp -a scripts ${hdrdest}
|
||||
|
||||
mkdir -p ${hdrdest}/arch/x86/kernel
|
||||
cp arch/x86/Makefile ${hdrdest}/arch/x86
|
||||
if [ "$arch" = "i386" ]; then
|
||||
cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
|
||||
fi
|
||||
cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p ${hdrdest}/drivers/media/pci/${i}
|
||||
cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc sn9c102; do
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/${i}
|
||||
cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
|
||||
done
|
||||
# i2c
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c
|
||||
cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
|
||||
for i in cx25840; do
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c/${i}
|
||||
cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
|
||||
done
|
||||
|
||||
# Add docbook makefile
|
||||
install -Dm644 Documentation/DocBook/Makefile \
|
||||
${hdrdest}/Documentation/DocBook/Makefile
|
||||
|
||||
# Add md headers
|
||||
mkdir -p ${hdrdest}/drivers/md
|
||||
cp drivers/md/*.h ${hdrdest}/drivers/md
|
||||
|
||||
# Add inotify.h
|
||||
mkdir -p ${hdrdest}/include/linux
|
||||
cp include/linux/inotify.h ${hdrdest}/include/linux
|
||||
|
||||
# Add wireless headers
|
||||
mkdir -p ${hdrdest}/net/mac80211/
|
||||
cp net/mac80211/*.h ${hdrdest}/net/mac80211
|
||||
|
||||
# add dvb headers for external modules
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-core
|
||||
cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
|
||||
mkdir -p ${hdrdest}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h \
|
||||
${hdrdest}/drivers/media/dvb-frontends/
|
||||
cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
|
||||
|
||||
# add dvb headers
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
|
||||
cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
|
||||
mkdir -p ${hdrdest}/drivers/media/tuners
|
||||
cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
|
||||
|
||||
# Add xfs and shmem for aufs building
|
||||
mkdir -p ${hdrdest}/fs/xfs
|
||||
mkdir -p ${hdrdest}/mm
|
||||
cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h
|
||||
|
||||
# Copy in Kconfig files
|
||||
for i in $(find . -name "Kconfig*"); do
|
||||
mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
|
||||
cp $i ${hdrdest}/$i
|
||||
done
|
||||
|
||||
# Remove unneeded architectures
|
||||
for arch in alpha arm* avr32 blackfin cris frv h8300 \
|
||||
ia64 m* p* s* um v850 xtensa; do
|
||||
rm -rf ${hdrdest}/arch/${arch}
|
||||
done
|
||||
|
||||
# Compress all modules with gzip to save a few MBs.
|
||||
msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
|
||||
find ${DESTDIR} -name '*.ko' -exec gzip -9 {} \;
|
||||
|
||||
# ... and run depmod again.
|
||||
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
|
||||
}
|
||||
|
||||
linux3.10-headers_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
short_desc+=" - source headers for 3rd party modules"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules/${_kernver}/build
|
||||
}
|
||||
}
|
||||
|
||||
linux3.10_package() {
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
preserve=yes
|
||||
triggers="kernel-hooks"
|
||||
depends="dracut linux-firmware kmod>=11_2"
|
||||
# These files could be modified when an external module is built.
|
||||
mutable_files="
|
||||
/usr/lib/modules/${_kernver}/modules.dep
|
||||
/usr/lib/modules/${_kernver}/modules.dep.bin
|
||||
/usr/lib/modules/${_kernver}/modules.symbols
|
||||
/usr/lib/modules/${_kernver}/modules.symbols.bin
|
||||
/usr/lib/modules/${_kernver}/modules.alias
|
||||
/usr/lib/modules/${_kernver}/modules.alias.bin
|
||||
/usr/lib/modules/${_kernver}/modules.devname"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
39
srcpkgs/mcwm-git/template
Normal file
39
srcpkgs/mcwm-git/template
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
# Template file for 'mcwm-git'
|
||||
pkgname=mcwm-git
|
||||
version="$(date +%Y%m%d)"
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel"
|
||||
short_desc="A minimalist stacking X window manager based on XCB"
|
||||
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
|
||||
license="ISC"
|
||||
homepage="http://hack.org/mc/projects/mcwm/"
|
||||
|
||||
nofetch=yes
|
||||
noextract=yes
|
||||
|
||||
do_fetch() {
|
||||
local url="git://hack.org/mcwm"
|
||||
msg_normal "Fetching source from $url ...\n"
|
||||
git clone ${url} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
do_build() {
|
||||
sed -i 's/man\/man1/share\/man\/man1/g' Makefile
|
||||
make CC=$CC ${makejobs}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
vmkdir usr/bin
|
||||
vmkdir usr/share/man/man1
|
||||
make PREFIX=${DESTDIR}/usr install
|
||||
vinstall LICENSE 644 usr/share/licenses/${pkgname}
|
||||
}
|
||||
|
||||
mcwm-git_package() {
|
||||
provides="mcwm-${version}"
|
||||
replaces="mcwm>=0"
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Sun, 23 Jun 2013 21:01:12 +0000
|
||||
Subject: sna: Clear 'clear' hint upon uploading into tiled
|
||||
|
||||
Fixes regression from
|
||||
commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
|
||||
Author: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Fri Jun 21 19:27:24 2013 +0100
|
||||
|
||||
sna: Allow PutImage to write inplace using manual tiling
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
|
||||
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
---
|
||||
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
|
||||
index 0994c33..43d6a67 100644
|
||||
--- src/sna/sna_accel.c
|
||||
+++ src/sna/sna_accel.c
|
||||
@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
|
||||
} while (--n);
|
||||
__kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
|
||||
|
||||
+ priv->clear = false;
|
||||
+ priv->cpu = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template build file for 'xf86-video-intel'.
|
||||
pkgname=xf86-video-intel
|
||||
version=2.21.10
|
||||
version=2.21.11
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
|
||||
|
|
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://xorg.freedesktop.org/"
|
||||
license="MIT"
|
||||
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
||||
checksum=7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6
|
||||
checksum=523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
# Template file for 'xz'
|
||||
pkgname=xz
|
||||
version=5.0.4
|
||||
revision=4
|
||||
version=5.0.5
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
short_desc="The XZ utilities"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="Public domain, GPL-2, GPL-3, LGPL-2.1"
|
||||
homepage="http://tukani.org/xz"
|
||||
distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2"
|
||||
checksum=5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92
|
||||
checksum=166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490
|
||||
|
||||
liblzma_package() {
|
||||
short_desc="XZ-format compression library"
|
||||
replaces="xz<5.0.0"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so*"
|
||||
vmove "usr/lib/*.so.*"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -25,6 +25,7 @@ liblzma-devel_package() {
|
|||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue