summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/linux-libre-tools/PKGBUILD70
-rw-r--r--libre/linux-libre-tools/usbipd.conf3
-rw-r--r--libre/linux-libre-tools/usbipd.rc34
-rw-r--r--libre/linux-libre-tools/usbipd.service8
-rw-r--r--libre/vhba-module-libre/60-vhba.rules13
-rw-r--r--libre/vhba-module-libre/PKGBUILD48
-rw-r--r--libre/vhba-module-libre/vhba-module.install21
-rw-r--r--pcr/bsnes/PKGBUILD72
-rw-r--r--pcr/bsnes/bsnes.changelog13
-rw-r--r--pcr/bsnes/bsnes.install12
10 files changed, 247 insertions, 47 deletions
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 1e9216af6..9708d9b1a 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,31 +3,43 @@
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=linux-libre-tools
-_pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
-pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre')
+pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
_basekernel=3.5
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=2
+pkgrel=3
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
options=('!strip')
-makedepends=('asciidoc' 'xmlto')
# split packages need all package dependencies set manually in makedepends
-makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils')
+# kernel source deps
+makedepends=('asciidoc' 'xmlto')
+# perf-libre deps
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils')
+# cpupower-libre deps
+makedepends+=('pciutils')
+# usbip-libre deps
+makedepends+=('glib2' 'sysfsutils')
+groups=("$pkgbase")
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
#"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
- 'cpupower.rc'
'cpupower.conf'
+ 'cpupower.rc'
'cpupower.systemd'
- 'cpupower.service')
+ 'cpupower.service'
+ 'usbipd.conf'
+ 'usbipd.rc'
+ 'usbipd.service')
md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
- '1d9214637968b91706b6e616a100d44b'
'18d5aa9e4c6bb23bb02bf65e155e0f0e'
+ '1d9214637968b91706b6e616a100d44b'
'c0d17b5295fe964623c772a2dd981771'
- '2450e8ff41b30eb58d43b5fffbfde1f4')
+ '2450e8ff41b30eb58d43b5fffbfde1f4'
+ 'e8fac9c45a628015644b4150b139278a'
+ '8a3831d962ff6a9968c0c20fd601cdec'
+ 'ba7c1c513314dd21fb2334fb8417738f')
build() {
# apply stable patching set
@@ -36,7 +48,7 @@ build() {
patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
fi
- msg2 'Build perf'
+ msg2 'Build perf-libre'
pushd linux-$pkgver/tools/perf
make \
WERROR=0 \
@@ -48,22 +60,29 @@ build() {
all man
popd
- msg2 'Build cpupower'
+ msg2 'Build cpupower-libre'
pushd linux-$pkgver/tools/power/cpupower
# we cannot use --as-needed
LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
make VERSION=$pkgver-$pkgrel
popd
- msg2 'Build x86_energy_perf_policy'
+ msg2 'Build x86_energy_perf_policy-libre'
pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
make
popd
+
+ msg2 'Build usbip-libre'
+ pushd linux-$pkgver/drivers/staging/usbip/userspace
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
+ popd
}
package_perf-libre() {
pkgdesc='Linux-libre kernel performance auditing tool'
- depends=('python2' 'libnewt' 'elfutils')
+ depends=('perl' 'python2' 'libnewt' 'elfutils')
replaces=('perf')
conflicts=('perf')
provides=("perf=$pkgver")
@@ -82,7 +101,7 @@ package_perf-libre() {
package_cpupower-libre() {
pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
backup=('etc/conf.d/cpupower')
- depends=('pciutils')
+ depends=('bash' 'pciutils')
replaces=('cpupower')
conflicts=('cpupower' 'cpufrequtils')
provides=("cpupower=$pkgver")
@@ -94,7 +113,7 @@ package_cpupower-libre() {
docdir='/usr/share/doc/cpupower' \
install install-man
popd
- # install rc.d script
+ # install daemon scripts
install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
@@ -103,6 +122,7 @@ package_cpupower-libre() {
package_x86_energy_perf_policy-libre() {
pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+ depends=('glibc')
replaces=('x86_energy_perf_policy')
conflicts=('x86_energy_perf_policy')
provides=("x86_energy_perf_policy=$pkgver")
@@ -112,4 +132,24 @@ package_x86_energy_perf_policy-libre() {
install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
}
+package_usbip-libre() {
+ pkgdesc='An USB device sharing system over IP network'
+ depends=('glib2' 'sysfsutils')
+ options=('!libtool')
+ replaces=('usbip')
+ conflicts=('usbip')
+ provides=("usbip=$pkgver")
+
+ pushd linux-$pkgver/drivers/staging/usbip/userspace
+ make install DESTDIR="$pkgdir"
+ popd
+ # module loading
+ install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ # install daemon scripts
+ install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
+ install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+ install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
+}
+
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
new file mode 100644
index 000000000..5990b857a
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+DAEMON_OPTS=''
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
new file mode 100644
index 000000000..15a1bcf00
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.rc
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/${0##*/}
+
+DAEMON=/usr/sbin/usbipd
+PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--daemon $DAEMON_OPTS"
+
+case "$1" in
+ start)
+ stat_busy "Starting ${0##*/} daemon"
+ [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+ stat_fail
+ ;;
+ stop)
+ stat_busy "Stopping ${0##*/} daemon"
+ [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+ stat_fail
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ exit 0
+ ;;
+ *)
+ echo "usage: ${0##*/} {start|stop|restart}" >&2
+ ;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
new file mode 100644
index 000000000..ac2f5f7c1
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=USB/IP server
+
+[Service]
+ExecStart=/usr/sbin/usbipd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
new file mode 100644
index 000000000..e4de1dca7
--- /dev/null
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -0,0 +1,13 @@
+ACTION=="remove", GOTO="vhba_end"
+KERNEL!="vhba_ctl", GOTO="vhba_end"
+
+NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
+
+TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
+TAG+="udev-acl"
+GOTO="vhba_end"
+
+LABEL="vhba_uaccess"
+TAG+="uaccess"
+
+LABEL="vhba_end"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
new file mode 100644
index 000000000..2de64bc38
--- /dev/null
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: Charles Lindsay <charles@chaoslizard.org>
+
+_pkgname=vhba-module
+pkgname=vhba-module-libre
+pkgver=20120422
+_extramodules=extramodules-3.5-LIBRE
+pkgrel=6
+pkgdesc="Kernel module that emulates SCSI devices"
+arch=('i686' 'x86_64')
+url="http://cdemu.sourceforge.net/"
+license=('GPL')
+depends=('linux-libre>=3.5' 'linux-libre<3.6')
+makedepends=('linux-libre-headers')
+options=(!makeflags)
+install=$_pkgname.install
+replaces=('vhba-module')
+conflicts=('vhba-module')
+provides=("vhba-module=$pkgver")
+source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
+ '60-vhba.rules')
+md5sums=('d97372da1d270d1605742b2995fb6678'
+ 'b5e82d0160e7a181219b67c1794d5c27')
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+
+ make KDIR=/usr/lib/modules/$_kernver/build
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ install -Dm644 vhba.ko \
+ "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
+ "$startdir/vhba-module.install"
+
+ install -Dm644 "$srcdir/60-vhba.rules" \
+ "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
new file mode 100644
index 000000000..ac27991cc
--- /dev/null
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -0,0 +1,21 @@
+_updatemod() {
+ echo " > Updating module dependencies..."
+ EXTRAMODULES='extramodules-3.5-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_upgrade() {
+ getent group cdemu &>/dev/null || groupadd cdemu
+ _updatemod
+}
+
+post_remove() {
+ _updatemod
+ groupdel cdemu
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/bsnes/PKGBUILD b/pcr/bsnes/PKGBUILD
index 34a8031e9..04c61bc30 100644
--- a/pcr/bsnes/PKGBUILD
+++ b/pcr/bsnes/PKGBUILD
@@ -1,63 +1,77 @@
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+# Split-package support hack for AUR.
pkgname='bsnes'
-pkgver=088
-pkgrel=1
-pkgdesc="Super Nintendo Entertainment System (SNES) emulator focused on accuracy."
+
+true && pkgbase='bsnes'
+true && pkgname=('bsnes' 'bsnes-purify')
+pkgver=090
+pkgrel=2
+pkgdesc='Super Nintendo Entertainment System (SNES) emulator focused on accuracy.'
arch=('i686' 'x86_64')
-url="http://byuu.org/bsnes/"
+url='http://byuu.org/bsnes/'
license=('GPL3')
-depends=('libao' 'libgl' 'libxv' 'openal' 'sdl' 'qt>=4.7.0')
+depends=('libao' 'libgl' 'libxv' 'openal' 'sdl' 'qt>=4.8.0')
makedepends=('pkgconfig' 'mesa')
install='bsnes.install'
changelog='bsnes.changelog'
-source=('http://bsnes.googlecode.com/files/bsnes_v088-source.tar.xz' 'add-usr-share-fallback.patch')
-md5sums=('a3b2e9ba28b752768bb9f777049b1239' '8fde2bb14f8dafbd5276f9a6092b7ffb')
-
+source=('http://bsnes.googlecode.com/files/bsnes_v090-source.tar.xz')
+md5sums=('c9642dae4255f5c6022b2217d64d3bc5')
-# Build the accuracy profile (you can also choose 'performance' or 'compatibility')
+__base_path="${srcdir}/${pkgbase}_v${pkgver}-source"
+# Build the accuracy profile (you can also choose 'performance' or 'compatibility').
__profile='accuracy'
build() {
- cd "${srcdir}/${pkgname}_v${pkgver}-source/${pkgname}"
+ cd "${__base_path}/${pkgname}"
# Makefile hacks:
# Disable pulseaudio.
sed -e 's|audio.pulseaudio ||' \
-e 's|audio.pulseaudiosimple ||' \
- -i 'target-ui/Makefile'
+ -i 'target-ethos/Makefile'
# Don't copy the cheat file.
sed -e '/mkdir -p ~\/.config\/$(name)/{N;d}' \
-e '/cp data\/cheats.xml/{N;d}' \
- -i 'target-ui/Makefile'
+ -i 'target-ethos/Makefile'
# Don't use sudo
sed -e 's/sudo install/install/' \
- -i 'target-ui/Makefile'
-
- # Apply patch to make bsnes look in /usr/share/bsnes for filters/shaders.
- patch -p0 < "${srcdir}/add-usr-share-fallback.patch"
+ -i 'target-ethos/Makefile'
# Fix building with QT >= 4.8.0.
moc -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
# Compile bsnes.
- make flags="$CXXFLAGS -I. -DPROFILE_${__profile^^}" compiler=gcc platform=x profile=${__profile} phoenix=qt
+ make flags="$CXXFLAGS -I. -DPROFILE_${__profile^^}" compiler=gcc platform=x \
+ profile=${__profile} phoenix=qt target=ethos
+
+ # Compile purify.
+ cd "${__base_path}/purify"
+ moc -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
+ sed -e 's|link := -s|link := -s -lX11|' -i 'Makefile'
+ make compiler=gcc platform=x phoenix=qt
+}
+
+package_bsnes-purify() {
+ pkgver=01
+ pkgdesc='ROM cleanup utility for bsnes.'
+ install=''
- # Compile the filters.
- cd "${srcdir}/${pkgname}_v${pkgver}-source/snesfilter"
- make compiler=gcc platform=x
+ cd "${__base_path}/purify"
+ install --directory "${pkgdir}/usr/bin"
+ install --mode=755 "${__base_path}/purify/purify" "${pkgdir}/usr/bin/${pkgbase}-purify"
}
-package() {
- cd "${srcdir}/${pkgname}_v${pkgver}-source/${pkgname}"
- make install profile=${__profile} DESTDIR="${pkgdir}" prefix=/usr
+package_bsnes() {
+ pkgver=090
+ pkgrel=2
+ pkgdesc='Super Nintendo Entertainment System (SNES) emulator focused on accuracy.'
+ url='http://byuu.org/bsnes/'
- # Install the filters/shaders
- install --directory "${pkgdir}/usr/share/${pkgname}/filters"
- install -D --mode=644 "${srcdir}/${pkgname}_v${pkgver}-source"/snesfilter/out/*.filter "${pkgdir}/usr/share/${pkgname}/filters"
- install --directory "${pkgdir}/usr/share/${pkgname}/shaders"
- install -D --mode=644 "${srcdir}/${pkgname}_v${pkgver}-source"/snesshader/*.shader "${pkgdir}/usr/share/${pkgname}/shaders"
+ cd "${__base_path}/${pkgname}"
+ make install profile=${__profile} DESTDIR="${pkgdir}" prefix=/usr
# Install the user-profile into /usr/share/bsnes/profile.
install --directory "${pkgdir}/usr/share/${pkgname}/profile"
- cp -R "${srcdir}/${pkgname}_v${pkgver}-source/${pkgname}"/profile/* "${pkgdir}/usr/share/${pkgname}/profile"
+ cp -R "${__base_path}/${pkgname}"/profile/* "${pkgdir}/usr/share/${pkgname}/profile"
}
diff --git a/pcr/bsnes/bsnes.changelog b/pcr/bsnes/bsnes.changelog
index 589a929d2..9328c9aee 100644
--- a/pcr/bsnes/bsnes.changelog
+++ b/pcr/bsnes/bsnes.changelog
@@ -1,3 +1,16 @@
+2012-08-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+ * 090-2 :
+ Make sure to build bsnes purify with QT.
+
+2012-08-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+ * 090-1 :
+ New upstream release.
+
+ * add-usr-share-fallback.patch :
+ Remove patch as filter/shader support has been removed.
+
2012-04-24 [vEX] <niechift.dot.vex.at.gmail.dot.com>
* 088-1 :
diff --git a/pcr/bsnes/bsnes.install b/pcr/bsnes/bsnes.install
index f18765649..2e40f6bba 100644
--- a/pcr/bsnes/bsnes.install
+++ b/pcr/bsnes/bsnes.install
@@ -6,7 +6,13 @@ post_install() {
## arg 1: the new package version
## arg 2: the old package version
post_upgrade() {
- echo 'You should copy the /usr/share/bsnes/profile/ data into your'
- echo '~/.config/bsnes/ folder unless you have already done so. It contains'
- echo 'files that the emulator needs to function properly.'
+ echo 'As of 090 bsnes requires a new directory layout for the ROMs. You can'
+ echo 'use bsnes-purify to create it. You should also copy the '
+ echo '/usr/share/bsnes/profile/ data into your ~/.config/bsnes/ folder unless'
+ echo 'you have already done so. It contains files that the emulator needs to'
+ echo 'function properly.'
+
+ if [ "$(vercmp $2 090)" -lt 0 ]; then
+ echo 'The profile data changed with release 090, update your files.'
+ fi
}