diff options
Diffstat (limited to 'libre')
103 files changed, 407 insertions, 1274 deletions
diff --git a/libre/acpi_call-parabola-grsec/PKGBUILD b/libre/acpi_call-parabola-grsec/PKGBUILD deleted file mode 100644 index 4e17173f0..000000000 --- a/libre/acpi_call-parabola-grsec/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 116819 2014-08-04 07:10:28Z tpowa $ -# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> -# Contributor (Arch): mortzu <me@mortzu.de> -# Contributor (Arch): fnord0 <fnord0@riseup.net> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.15 -_kernelname=-grsec - -# Source info -_pkgname=acpi_call -pkgver=1.1.0 -pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)" -url="http://github.com/mkottman/${_pkgname}" -license=('GPL') -source=("${url}/archive/v${pkgver}.tar.gz") -sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') - -# Package info -pkgrel=12.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -install='kmod.install' -_replaces=("${_pkgname}" "${_pkgname}-libre") - -# Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_replaces[@]/%/${_kernelname}}") -conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${_pkgver}}") -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KVERSION="${_kernver}" -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - # Actually install - install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d} - install -m 644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules} - gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko - echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${pkgname}.conf - - install -dm 755 "${pkgdir}"/usr/share/${pkgname} - cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/ -} diff --git a/libre/acpi_call-parabola-grsec/kmod.install b/libre/acpi_call-parabola-grsec/kmod.install deleted file mode 100644 index d4bd8cb34..000000000 --- a/libre/acpi_call-parabola-grsec/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/acpi_call-parabola-lts/PKGBUILD b/libre/acpi_call-parabola-lts/PKGBUILD index 8487dcbd9..681c3399e 100644 --- a/libre/acpi_call-parabola-lts/PKGBUILD +++ b/libre/acpi_call-parabola-lts/PKGBUILD @@ -20,10 +20,11 @@ source=("${url}/archive/v${pkgver}.tar.gz") sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') # Package info -pkgrel=12.${_basekernel/./} +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' _replaces=("${_pkgname}" "${_pkgname}-libre") +_provides=("${_pkgname}") # Generic (you shouldn't have to modify any of these variables) pkgname=${_pkgname}-parabola${_kernelname} @@ -33,7 +34,7 @@ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}< makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${_pkgver}}") +provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}") if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call-parabola/PKGBUILD index 02552d841..2ae1fd139 100644 --- a/libre/acpi_call-parabola/PKGBUILD +++ b/libre/acpi_call-parabola/PKGBUILD @@ -6,37 +6,34 @@ # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Márcio Silva <coadde@parabola.nu> -# Kernel info _basekernel=3.16 -_kernelname= +_kernelname= # libre/linux-libre{,-lts} -# Source info _pkgname=acpi_call +pkgname=${_pkgname}-parabola${_kernelname} pkgver=1.1.0 +pkgrel=11.1 +_extramodules=extramodules-${_basekernel}${_kernelname} pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)" +arch=('i686' 'x86_64' 'mips64el') url="http://github.com/mkottman/${_pkgname}" license=('GPL') -source=("${url}/archive/v${pkgver}.tar.gz") -sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') - -# Package info -pkgrel=12.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -install='kmod.install' -_replaces=("${_pkgname}" "${_pkgname}-libre") # Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") + +_replaces=("${_pkgname}" "${_pkgname}-libre") +_provides=("${_pkgname}") + replaces=( "${_replaces[@]/%/${_kernelname}}") conflicts=("${_replaces[@]/%/${_kernelname}}") -provides=( "${_replaces[@]/%/${_kernelname}=${_pkgver}}") -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi +provides=( "${_provides[@]/%/${_kernelname}=${pkgver}}") + +install='kmod.install' +source=("${url}/archive/v${pkgver}.tar.gz") +sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') build() { cd "${srcdir}/${_pkgname}-${pkgver}" @@ -52,7 +49,7 @@ package() { # Set the correct extramodules directory for install cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" + sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}" # Actually install install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d} @@ -63,3 +60,5 @@ package() { install -dm 755 "${pkgdir}"/usr/share/${pkgname} cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/ } + +# vim: ts=2 sw=2 et: diff --git a/libre/acpi_call-parabola/kmod.install b/libre/acpi_call-parabola/kmod.install index d4bd8cb34..40caa464f 100644 --- a/libre/acpi_call-parabola/kmod.install +++ b/libre/acpi_call-parabola/kmod.install @@ -1,14 +1,14 @@ +_EXTRAMODULES= + post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) + echo ">>> Updating module dependencies. Please wait ..." + depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1 } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } - -# vim: ts=2 sw=2 et: diff --git a/libre/bbswitch-parabola-grsec/PKGBUILD b/libre/bbswitch-parabola-grsec/PKGBUILD deleted file mode 100644 index e00800dfa..000000000 --- a/libre/bbswitch-parabola-grsec/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 116821 2014-08-04 07:12:07Z tpowa $ -# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor (Arch): M0Rf30 -# Contributor (Arch): Samsagax <samsagax@gmail.com> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.15 -_kernelname=-grsec - -# Source info -_pkgname=bbswitch -pkgver=0.8 -pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre${_kernelname} kernel package)" -url="http://github.com/Bumblebee-Project/bbswitch" -license=('GPL') -source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") -md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') - -# Package info -pkgrel=16.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -install='kmod.install' - -# Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KDIR=/lib/modules/${_kernver}/build -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - # Actually install - install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko" -} diff --git a/libre/bbswitch-parabola-grsec/kmod.install b/libre/bbswitch-parabola-grsec/kmod.install deleted file mode 100644 index d4bd8cb34..000000000 --- a/libre/bbswitch-parabola-grsec/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/bbswitch-parabola-lts/PKGBUILD b/libre/bbswitch-parabola-lts/PKGBUILD deleted file mode 100644 index 77f4f1385..000000000 --- a/libre/bbswitch-parabola-lts/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 116821 2014-08-04 07:12:07Z tpowa $ -# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor (Arch): M0Rf30 -# Contributor (Arch): Samsagax <samsagax@gmail.com> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.14 -_kernelname=-lts - -# Source info -_pkgname=bbswitch -pkgver=0.8 -pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre${_kernelname} kernel package)" -url="http://github.com/Bumblebee-Project/bbswitch" -license=('GPL') -source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") -md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') - -# Package info -pkgrel=16.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -install='kmod.install' - -# Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KDIR=/lib/modules/${_kernver}/build -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - # Actually install - install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko" -} diff --git a/libre/bbswitch-parabola-lts/kmod.install b/libre/bbswitch-parabola-lts/kmod.install deleted file mode 100644 index d4bd8cb34..000000000 --- a/libre/bbswitch-parabola-lts/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD index 5874cc622..1b0dc8bd6 100644 --- a/libre/bbswitch-parabola/PKGBUILD +++ b/libre/bbswitch-parabola/PKGBUILD @@ -20,7 +20,7 @@ source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807') # Package info -pkgrel=16.${_basekernel/./} +pkgrel=15.1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' @@ -30,9 +30,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/bfgminer-parabola/PKGBUILD b/libre/bfgminer-parabola/PKGBUILD index a7309d7ee..51fbc80a4 100644 --- a/libre/bfgminer-parabola/PKGBUILD +++ b/libre/bfgminer-parabola/PKGBUILD @@ -10,9 +10,9 @@ pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors') makedepends=('uthash' 'yasm') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) +replaces=("${_pkgname}" "${_pkgname}-libre") +conflicts=("${_pkgname}" "${_pkgname}-libre") +provides=("${_pkgname}=$pkgver") url='http://bfgminer.org/' license=('GPL3') source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz diff --git a/libre/cups-filters-parabola/PKGBUILD b/libre/cups-filters-parabola/PKGBUILD index fd91bd6dc..7d8af05b1 100644 --- a/libre/cups-filters-parabola/PKGBUILD +++ b/libre/cups-filters-parabola/PKGBUILD @@ -18,8 +18,8 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf etc/cups/cups-browsed.conf) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) provides=("${_pkgname}=${pkgver}" 'foomatic-filters') -replaces=("${_pkgname}" 'foomatic-filters') -conflicts=("${_pkgname}" 'foomatic-filters') +replaces=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre") +conflicts=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre") md5sums=('0143ef62cd229e99fd3b03e827b1c122') build() { diff --git a/libre/evince-libre/PKGBUILD b/libre/evince-libre/PKGBUILD index 1072f097f..e31379442 100644 --- a/libre/evince-libre/PKGBUILD +++ b/libre/evince-libre/PKGBUILD @@ -25,7 +25,7 @@ install=evince.install options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz libarchive.patch) -sha256sums=('ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137' +sha256sums=('30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d' '023f01f40c5efb8bf245d97067b3ef1da74f96a0bc53e53eb3d990d6c29b9e5e') prepare() { cd $_pkgname-$pkgver diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem-parabola/PKGBUILD index 74e507fce..0bc0fac54 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem-parabola/PKGBUILD @@ -3,9 +3,10 @@ # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer: André Silva <emulatorman@parabola.nu> -pkgname=filesystem +_pkgname=filesystem +pkgname=filesystem-parabola pkgver=2014.07 -pkgrel=1 +pkgrel=1.1 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,6 +15,9 @@ groups=('base') install='filesystem.install' makedepends=('asciidoc') depends=('iana-etc') +replaces=($_pkgname) +conflicts=($_pkgname) +provides=($_pkgname=$pkgver) backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') diff --git a/libre/filesystem/crypttab b/libre/filesystem-parabola/crypttab index 195945a74..195945a74 100644 --- a/libre/filesystem/crypttab +++ b/libre/filesystem-parabola/crypttab diff --git a/libre/filesystem/filesystem.install b/libre/filesystem-parabola/filesystem.install index 065a79d6c..d70906f47 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem-parabola/filesystem.install @@ -12,6 +12,17 @@ _adduser() { fi } +post_install() { + _backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' + 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') + for _bk in ${_backup[@]}; do + if [ -f ${_bk}.pacsave ]; then + cp -av ${_bk}{.pacsave,} + fi + done +} + post_upgrade() { _addgroup optical -g 93 _addgroup audio -g 92 diff --git a/libre/filesystem/fstab b/libre/filesystem-parabola/fstab index b6716c14a..b6716c14a 100644 --- a/libre/filesystem/fstab +++ b/libre/filesystem-parabola/fstab diff --git a/libre/filesystem/group b/libre/filesystem-parabola/group index ebfb87169..ebfb87169 100644 --- a/libre/filesystem/group +++ b/libre/filesystem-parabola/group diff --git a/libre/filesystem/gshadow b/libre/filesystem-parabola/gshadow index 1fcb075bc..1fcb075bc 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem-parabola/gshadow diff --git a/libre/filesystem/host.conf b/libre/filesystem-parabola/host.conf index cf52fe561..cf52fe561 100644 --- a/libre/filesystem/host.conf +++ b/libre/filesystem-parabola/host.conf diff --git a/libre/filesystem/hosts b/libre/filesystem-parabola/hosts index 1747f9196..1747f9196 100644 --- a/libre/filesystem/hosts +++ b/libre/filesystem-parabola/hosts diff --git a/libre/filesystem/issue b/libre/filesystem-parabola/issue index b001c55dd..b001c55dd 100644 --- a/libre/filesystem/issue +++ b/libre/filesystem-parabola/issue diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem-parabola/ld.so.conf index dfac45683..dfac45683 100644 --- a/libre/filesystem/ld.so.conf +++ b/libre/filesystem-parabola/ld.so.conf diff --git a/libre/filesystem/locale.sh b/libre/filesystem-parabola/locale.sh index 3cfc89c1b..3cfc89c1b 100644 --- a/libre/filesystem/locale.sh +++ b/libre/filesystem-parabola/locale.sh diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first index 947379411..947379411 100644 --- a/libre/filesystem/modprobe.d.usb-load-ehci-first +++ b/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first diff --git a/libre/filesystem/motd b/libre/filesystem-parabola/motd index e69de29bb..e69de29bb 100644 --- a/libre/filesystem/motd +++ b/libre/filesystem-parabola/motd diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem-parabola/nsswitch.conf index 4a4f5770d..4a4f5770d 100644 --- a/libre/filesystem/nsswitch.conf +++ b/libre/filesystem-parabola/nsswitch.conf diff --git a/libre/filesystem/os-release b/libre/filesystem-parabola/os-release index fe5f20b4f..fe5f20b4f 100644 --- a/libre/filesystem/os-release +++ b/libre/filesystem-parabola/os-release diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem-parabola/parabola.7.txt index 60e1121e0..60e1121e0 100644 --- a/libre/filesystem/parabola.7.txt +++ b/libre/filesystem-parabola/parabola.7.txt diff --git a/libre/filesystem/passwd b/libre/filesystem-parabola/passwd index b3e79eb9d..b3e79eb9d 100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem-parabola/passwd diff --git a/libre/filesystem/profile b/libre/filesystem-parabola/profile index 59d0abc83..59d0abc83 100644 --- a/libre/filesystem/profile +++ b/libre/filesystem-parabola/profile diff --git a/libre/filesystem/resolv.conf b/libre/filesystem-parabola/resolv.conf index cecafba03..cecafba03 100644 --- a/libre/filesystem/resolv.conf +++ b/libre/filesystem-parabola/resolv.conf diff --git a/libre/filesystem/securetty b/libre/filesystem-parabola/securetty index 5a2235ce7..5a2235ce7 100644 --- a/libre/filesystem/securetty +++ b/libre/filesystem-parabola/securetty diff --git a/libre/filesystem/shadow b/libre/filesystem-parabola/shadow index 4c6e3d18f..4c6e3d18f 100644 --- a/libre/filesystem/shadow +++ b/libre/filesystem-parabola/shadow diff --git a/libre/filesystem/shells b/libre/filesystem-parabola/shells index 18c1aeffa..18c1aeffa 100644 --- a/libre/filesystem/shells +++ b/libre/filesystem-parabola/shells diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch index e043633af..e043633af 100644 --- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch +++ b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch diff --git a/libre/grub/09_parabola b/libre/grub-parabola/09_parabola index 90a9062a3..90a9062a3 100644 --- a/libre/grub/09_parabola +++ b/libre/grub-parabola/09_parabola diff --git a/libre/grub/60_memtest86+ b/libre/grub-parabola/60_memtest86+ index 086f0cc84..086f0cc84 100644 --- a/libre/grub/60_memtest86+ +++ b/libre/grub-parabola/60_memtest86+ diff --git a/libre/grub/PKGBUILD b/libre/grub-parabola/PKGBUILD index 213e7dee0..a4c4bfb9f 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub-parabola/PKGBUILD @@ -21,7 +21,8 @@ _UNIFONT_VER="6.3.20131217" [[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" -pkgname="grub" +_pkgname="grub" +pkgname="grub-parabola" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.02.beta2 pkgrel=4 @@ -30,12 +31,12 @@ url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') backup=('etc/default/grub' 'etc/grub.d/40_custom') -install="${pkgname}.install" +install="${_pkgname}.install" options=('!makeflags') -conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') -replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") -provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub') +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" "grub=$pkgver") makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch index 18d9d520c..18d9d520c 100644 --- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch +++ b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch diff --git a/libre/grub/grub-10_linux-rebrand-free-distros.patch b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch index 7edb22a1f..7edb22a1f 100644 --- a/libre/grub/grub-10_linux-rebrand-free-distros.patch +++ b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub-parabola/grub-2.00-fix-docs.patch index 0aa481154..0aa481154 100644 --- a/libre/grub/grub-2.00-fix-docs.patch +++ b/libre/grub-parabola/grub-2.00-fix-docs.patch diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch index 1af848fa3..1af848fa3 100644 --- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch +++ b/libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch index 9a2eb3ff7..9a2eb3ff7 100644 --- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch +++ b/libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch index c113a81d5..c113a81d5 100644 --- a/libre/grub/grub-add-GRUB_COLOR_variables.patch +++ b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch diff --git a/libre/grub/grub.default b/libre/grub-parabola/grub.default index 56585a47d..56585a47d 100644 --- a/libre/grub/grub.default +++ b/libre/grub-parabola/grub.default diff --git a/libre/grub/grub.install b/libre/grub-parabola/grub.install index 9188b357a..9188b357a 100644 --- a/libre/grub/grub.install +++ b/libre/grub-parabola/grub.install diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch index 6e3a524f0..6e3a524f0 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub-parabola/parabola_grub_mkconfig_fixes.patch diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 07a973f1c..1890af721 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -10,13 +10,14 @@ _pkgbasever=3.14-gnu _pkgver=3.14.1-gnu _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=1.1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') -provides=( "linux-api-headers=${pkgver}") +provides=( "linux-api-headers=${_archpkgver}") conflicts=('linux-api-headers') replaces=( 'linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 7634b5110..8bb1a3c5e 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -7,7 +7,7 @@ _pkgver=3.16-gnu _srcname=linux-${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=2 pkgdesc='Firmware files for Linux-libre' arch=('any') url=('http://linux-libre.fsfla.org/') diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 2041f3005..4b399ae80 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -16,9 +16,12 @@ _pkgver=3.15.10-gnu _grsecver=3.0 _timestamp=201408212335 -_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname +_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname +_replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*}.${_timestamp} pkgver=${_pkgver//-/.}.${_timestamp} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -53,7 +56,9 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' '3854de5c0be17555dc0c5b4ec4e831225eaacf413395d74568a06abcddf3a242') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -125,9 +130,9 @@ _package() { optdepends=('crda: to set the correct wireless channels of your country' 'gradm: to configure and enable Role Based Access Control (RBAC)' 'paxd: to enable PaX exploit mitigations and apply exceptions automatically') - provides=( "${_replaces[@]/%/=${pkgver}}") - conflicts=("${_replaces[@]}") - replaces=( "${_replaces[@]}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -193,9 +198,9 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${pkgver}}") - conflicts=("${_replaces[@]/%/-headers}") - replaces=( "${_replaces[@]/%/-headers}") + provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -312,9 +317,9 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${pkgver}}") - conflicts=("${_replaces[@]/%/-docs}") - replaces=( "${_replaces[@]/%/-docs}") + provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f0f502750..f40f2c58f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -11,11 +11,14 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu _pkgver=3.14.17-gnu -_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname +_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname +_replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -37,10 +40,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'f747eeb343d5105bcd1a1b02ce391c746bccbce62e58394b674fc553be844ccc' - '9e7dcc90121995024632476d50286b62dbb73da20a7970653a2d72a0a98406c0' - '35f283689c4f8b346bc05ac57c3cce50a61a1d0c11a665fc1abf519bb3f1beea' - 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '2114c304b6a2eb7ed6549cd7162ad2312eac30729b3dd5cb5a50aa55d954cf6a' + '76ee0a0d4e2eb6f0fd180c72b17ab1afbc77d280a246816997c8300f3ed0e97b' 'b053633d23d85972e5a99a83dc93bdab9b8aa1ab8450e98e3b84b46faa669fef' + 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' @@ -52,7 +55,9 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -129,9 +134,9 @@ _package() { [ "${pkgbase}" = "linux-libre" ] && groups=('base') depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=( "${_replaces[@]/%/=${pkgver}}") - conflicts=("${_replaces[@]}") - replaces=( "${_replaces[@]}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -188,9 +193,9 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${pkgver}}") - conflicts=("${_replaces[@]/%/-headers}") - replaces=( "${_replaces[@]/%/-headers}") + provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -307,9 +312,9 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${pkgver}}") - conflicts=("${_replaces[@]/%/-docs}") - replaces=( "${_replaces[@]/%/-docs}") + provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index 1a96051e3..650aea794 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -8,16 +8,17 @@ pkgname=linux-libre-manpages _pkgver=3.14-gnu _srcname=linux-${_pkgver%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 -pkgdesc="Kernel hackers manual - Section 9 manpages that come with the Linux-libre kernel" +pkgrel=1.2 +pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') -provides=('kernel26-manpages' 'linux-manpages') +provides=("linux-manpages=${_archpkgver}") source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/linux-libre-${_pkgver}.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b') diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 79a67a94d..ebdd31fa6 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 116876 2014-08-05 00:19:20Z seblu $ # Maintainer (Arch): Sébastien Luttringer <seblu@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Márcio Silva <coadde@parabola.nu> +_pkgdesc='Linux-libre kernel' pkgbase=linux-libre-tools _pkgname=( 'acpidump' @@ -14,14 +15,15 @@ _pkgname=( 'usbip' 'x86_energy_perf_policy' ) -pkgname=("$pkgbase" "${_pkgname[@]/#/${pkgbase}-}") +pkgname=("${pkgbase}-meta" "${_pkgname[@]/#/${pkgbase}_}") _pkgbasever=3.16-gnu _pkgver=3.16-gnu _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=1.3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -126,16 +128,16 @@ build() { } _package_meta() { - pkgdesc='Linux-libre kernel tools meta package' + pkgdesc="${_pkgdesc} tools meta package" groups=() - depends=("${_pkgname[@]/#/${pkgbase}-}") - replaces=( linux{,-libre}-tools-meta) - conflicts=(linux{,-libre}-tools-meta) - provides=( linux{,-libre}-tools-meta=$pkgver) + depends=("${_pkgname[@]/#/${pkgbase}_}") + replaces=(linux-tools-meta) + conflicts=(linux-tools-meta) + provides=(linux-tools-meta=$_archpkgver) } _package_libtraceevent() { - pkgdesc='Linux-libre kernel trace event library' + pkgdesc="${_pkgdesc} trace event library" depends=('glibc') cd $_srcname/tools/lib/traceevent @@ -144,7 +146,7 @@ _package_libtraceevent() { } _package_perf() { - pkgdesc='Linux-libre kernel performance auditing tool' + pkgdesc="${_pkgdesc} performance auditing tool" depends=('binutils') cd $_srcname/tools/perf @@ -164,7 +166,7 @@ _package_perf() { } _package_cpupower() { - pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' + pkgdesc="${_pkgdesc} tool to examine and tune power saving related features of your processor" backup=('etc/default/cpupower') depends=('bash') replaces=('cpufrequtils') @@ -195,7 +197,7 @@ _package_x86_energy_perf_policy() { } _package_usbip() { - pkgdesc='A USB device sharing system over IP network' + pkgdesc='An USB device sharing system over IP network' pushd $_srcname/drivers/staging/usbip/userspace make install DESTDIR="$pkgdir" @@ -208,7 +210,7 @@ _package_usbip() { } _package_tmon() { - pkgdesc='Monitoring and Testing Tool for Linux-libre kernel thermal subsystem' + pkgdesc="Monitoring and Testing Tool for ${_pkgdesc} thermal subsystem" depends=('glibc') cd $_srcname/tools/thermal/tmon @@ -234,15 +236,15 @@ _package_cgroup_event_listener() { install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener" } -eval "package_${pkgbase}() { _package_meta; }" +eval "package_${pkgbase}-meta() { _package_meta; }" for _p in "${_pkgname[@]}"; do eval " - package_${pkgbase}-${_p}() { + package_${pkgbase}_${_p}() { _package_${_p} depends+=(${_depends[${_p}]}) - replaces+=( ${_p}{,-libre}) - conflicts+=(${_p}{,-libre}) - provides+=( ${_p}{,-libre}=${pkgver}) + replaces+=("${_p}" "${_p}-libre" "${_p}-parabola") + conflicts+=("${_p}" "${_p}-libre" "${_p}-parabola") + provides+=(${_p}=${_archpkgver}) }" done diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index 5259f3e89..e801b2997 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,3 +1,9 @@ +2014-08-24 André Silva <emulatorman@parabola.nu> + + * linux-libre-3.16.1.gnu-1.1 + * Changed upstream format based from the source code. + * Disabled CONFIG_LOCALVERSION_AUTO + 2013-07-15 André Silva <emulatorman@parabola.nu> * linux-libre-3.10.1-1 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index c5a85232e..d8dea06c9 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -11,11 +11,14 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.16-gnu _pkgver=3.16.1-gnu -_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname +_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname +_replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname +_replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=1.2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -46,7 +49,9 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' 'fc78b69f6c0709f5170bfd609e8dc6c96291ea920ddbd4b5166448477b1f6619') _kernelname=${pkgbase#linux-libre} -_replaces=("${_replaces[@]/\%/${_kernelname}}") +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") case "$CARCH" in i686|x86_64) KARCH=x86;; @@ -115,9 +120,9 @@ _package() { [ "${pkgbase}" = "linux-libre" ] && groups=('base') depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=( "${_replaces[@]/%/=${pkgver}}") - conflicts=("${_replaces[@]}") - replaces=( "${_replaces[@]}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -174,9 +179,9 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-headers=${pkgver}}") - conflicts=("${_replaces[@]/%/-headers}") - replaces=( "${_replaces[@]/%/-headers}") + provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -293,9 +298,9 @@ _package-headers() { _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" - provides=( "${_replaces[@]/%/-docs=${pkgver}}") - conflicts=("${_replaces[@]/%/-docs}") - replaces=( "${_replaces[@]/%/-docs}") + provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") + conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" diff --git a/libre/lirc-parabola-grsec/PKGBUILD b/libre/lirc-parabola-grsec/PKGBUILD deleted file mode 100644 index d8fa2f122..000000000 --- a/libre/lirc-parabola-grsec/PKGBUILD +++ /dev/null @@ -1,137 +0,0 @@ -# $Id: PKGBUILD 220120 2014-08-16 22:32:11Z lfleischer $ -# Maintainer (Arch): Paul Mattal <paul@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.15 -_kernelname=-grsec - -# Source info -_pkgname=lirc-parabola${_kernelname} -# Only build lirc-utils once; for the stock kernel -if [[ -n "${_kernelname}" ]]; then - pkgname=$_pkgname -else - pkgbase=$_pkgname - pkgname=("$_pkgname" lirc-utils-parabola) -fi - -_pkgver=0.9.1a -[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" - -url="http://www.lirc.org/" -license=('GPL') -source=("http://prdownloads.sourceforge.net/lirc/lirc-${_pkgver}.tar.bz2" - "wpc8769l-build-fix.patch" - lirc.logrotate - irexec.service - lirc.tmpfiles) -md5sums=('1f1fac162ed309dd50f307e96a292957' - '9ec33169b3407f74264062d7679dd269' - '3deb02604b37811d41816e9b4385fcc3' - '32df3b9bc859565d6acf5f0e5b747083' - 'febf25c154a7d36f01159e84f26c2d9a') - -# Package info -pkgrel=1.${_basekernel/./} -epoch=1 -arch=('i686' 'x86_64' 'mips64el') -options=('!makeflags' '!strip') -makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') - -# Generic (you shouldn't have to modify any of these variables) -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -makedepends+=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}" - "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") - -prepare() { - cd "${srcdir}/lirc-${_pkgver}" - - patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch" - - sed -i '/AC_PATH_XTRA/d' configure.ac - sed -e 's/@X_CFLAGS@//g' \ - -e 's/@X_LIBS@//g' \ - -e 's/@X_PRE_LIBS@//g' \ - -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am - - libtoolize - autoreconf -} - -build() { - cd "${srcdir}/lirc-${_pkgver}" - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/" \ - --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \ - --sbindir=/usr/bin --with-transmitter - - # Remove drivers already in kernel - sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ - -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ - -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ - -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \ - -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - make -} - -_package_lirc() { - pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" - depends=('lirc-libre-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") - replaces=('lirc+pctv') - [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}") - install=kmod.install - - replaces+=( "lirc${_kernelname}" "lirc-libre${_kernelname}") - conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") - provides+=( "lirc${_kernelname}=${pkgver}" "lirc-libre${_kernelname}=${pkgver}") - - cd "${srcdir}/lirc-${_pkgver}/drivers" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install - gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko -} -if [[ -n "$_kernelname" ]]; then - eval "package() { _package_lirc; }" -else - eval "package_${_pkgname}() { _package_lirc; }" -fi - -package_lirc-utils-parabola() { - pkgdesc="Linux Infrared Remote Control utilities" - depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') - optdepends=('python2: pronto2lirc utility') - options=('strip') - backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') - - replaces=( 'lirc-utils' 'lirc-utils-libre') - conflicts=('lirc-utils' 'lirc-utils-libre') - provides=( "lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") - install=kmod.install - - cd "${srcdir}/lirc-${_pkgver}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service - install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf - - cp -rp remotes "${pkgdir}/usr/share/lirc" - chmod -R go-w "${pkgdir}/usr/share/lirc/" - - # install the logrotate config - install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - - # remove built modules - rm -r "${pkgdir}/usr/lib/modules" -} diff --git a/libre/lirc-parabola-grsec/irexec.service b/libre/lirc-parabola-grsec/irexec.service deleted file mode 100644 index dffbbf5e0..000000000 --- a/libre/lirc-parabola-grsec/irexec.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=LIRC command handler -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/irexec --daemon - -[Install] -WantedBy=multi-user.target -Wants=lircd.service diff --git a/libre/lirc-parabola-grsec/kmod.install b/libre/lirc-parabola-grsec/kmod.install deleted file mode 100644 index d4bd8cb34..000000000 --- a/libre/lirc-parabola-grsec/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/lirc-parabola-grsec/lirc-utils.install b/libre/lirc-parabola-grsec/lirc-utils.install deleted file mode 100644 index f7faa07eb..000000000 --- a/libre/lirc-parabola-grsec/lirc-utils.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - systemd-tmpfiles --create lirc.conf -} - -post_upgrade() { - post_install - - if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then - echo ':: lirc.service and lircm.service have been replaced' - echo ' by the upstream unit files lircd.service and' - echo ' lircmd.service.' - fi -} diff --git a/libre/lirc-parabola-grsec/lirc.logrotate b/libre/lirc-parabola-grsec/lirc.logrotate deleted file mode 100644 index 623c4f328..000000000 --- a/libre/lirc-parabola-grsec/lirc.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/lircd { - missingok - notifempty - delaycompress -} diff --git a/libre/lirc-parabola-grsec/lirc.tmpfiles b/libre/lirc-parabola-grsec/lirc.tmpfiles deleted file mode 100644 index 0b80e2e47..000000000 --- a/libre/lirc-parabola-grsec/lirc.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/lirc 0755 root root - diff --git a/libre/lirc-parabola-grsec/wpc8769l-build-fix.patch b/libre/lirc-parabola-grsec/wpc8769l-build-fix.patch deleted file mode 100644 index 5e25693ab..000000000 --- a/libre/lirc-parabola-grsec/wpc8769l-build-fix.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -index 790efa2..4248fe9 100644 ---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c -+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -@@ -51,17 +51,13 @@ - #include <linux/irq.h> - - #include <linux/acpi.h> -+#include <linux/types.h> - - #include <linux/platform_device.h> -+#include <asm-generic/bitops/find.h> - --#include "drivers/kcompat.h" --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) --#include <media/lirc.h> --#include <media/lirc_dev.h> --#else --#include "drivers/lirc.h" --#include "drivers/lirc_dev/lirc_dev.h" --#endif -+#include "media/lirc_dev.h" -+#include "media/lirc.h" - - #include "lirc_wpc8769l.h" - -@@ -105,11 +101,11 @@ static unsigned int baseport2; - static unsigned int irq; - - /* Debugging flag. */ --static int debug; -+static bool debug; - - /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and - * IRQ. */ --static int skip_probe; -+static bool skip_probe; - - /* Whether the device is open or not. */ - static int lirc_wpc8769l_is_open; -@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - size = count << 3; - - ldata = (unsigned long *) data_buf; -- next_one = generic_find_next_le_bit(ldata, size, 0); -+ next_one = find_next_bit(ldata, size, 0); - - if (next_one > 0) - put_pulse_bit(next_one - * WPC8769L_USECS_PER_BIT); - - while (next_one < size) { -- next_zero = generic_find_next_zero_le_bit(ldata, -+ next_zero = find_next_zero_bit(ldata, - size, next_one + 1); - - put_space_bit( -@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - * WPC8769L_USECS_PER_BIT); - - if (next_zero < size) { -- next_one = generic_find_next_le_bit(ldata, -+ next_one = find_next_bit(ldata, - size, next_zero + 1); - - put_pulse_bit( -@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void) - #ifdef MODULE - static struct platform_device *lirc_wpc8769l_platform_dev; - --static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) -+static int lirc_wpc8769l_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) -+static int lirc_wpc8769l_remove(struct platform_device *dev) - { - return 0; - } -@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device *dev) - - static struct platform_driver lirc_wpc8769l_platform_driver = { - .probe = lirc_wpc8769l_probe, -- .remove = __devexit_p(lirc_wpc8769l_remove), -+ .remove = lirc_wpc8769l_remove, - .suspend = lirc_wpc8769l_suspend, - .resume = lirc_wpc8769l_resume, - .driver = { diff --git a/libre/lirc-parabola-lts/PKGBUILD b/libre/lirc-parabola-lts/PKGBUILD deleted file mode 100644 index e9e3e4bd5..000000000 --- a/libre/lirc-parabola-lts/PKGBUILD +++ /dev/null @@ -1,137 +0,0 @@ -# $Id: PKGBUILD 220120 2014-08-16 22:32:11Z lfleischer $ -# Maintainer (Arch): Paul Mattal <paul@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.14 -_kernelname=-lts - -# Source info -_pkgname=lirc-parabola${_kernelname} -# Only build lirc-utils once; for the stock kernel -if [[ -n "${_kernelname}" ]]; then - pkgname=$_pkgname -else - pkgbase=$_pkgname - pkgname=("$_pkgname" lirc-utils-parabola) -fi - -_pkgver=0.9.1a -[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" - -url="http://www.lirc.org/" -license=('GPL') -source=("http://prdownloads.sourceforge.net/lirc/lirc-${_pkgver}.tar.bz2" - "wpc8769l-build-fix.patch" - lirc.logrotate - irexec.service - lirc.tmpfiles) -md5sums=('1f1fac162ed309dd50f307e96a292957' - '9ec33169b3407f74264062d7679dd269' - '3deb02604b37811d41816e9b4385fcc3' - '32df3b9bc859565d6acf5f0e5b747083' - 'febf25c154a7d36f01159e84f26c2d9a') - -# Package info -pkgrel=1.${_basekernel/./} -epoch=1 -arch=('i686' 'x86_64' 'mips64el') -options=('!makeflags' '!strip') -makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') - -# Generic (you shouldn't have to modify any of these variables) -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -makedepends+=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}" - "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") - -prepare() { - cd "${srcdir}/lirc-${_pkgver}" - - patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch" - - sed -i '/AC_PATH_XTRA/d' configure.ac - sed -e 's/@X_CFLAGS@//g' \ - -e 's/@X_LIBS@//g' \ - -e 's/@X_PRE_LIBS@//g' \ - -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am - - libtoolize - autoreconf -} - -build() { - cd "${srcdir}/lirc-${_pkgver}" - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/" \ - --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \ - --sbindir=/usr/bin --with-transmitter - - # Remove drivers already in kernel - sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ - -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ - -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ - -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \ - -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - make -} - -_package_lirc() { - pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" - depends=('lirc-libre-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") - replaces=('lirc+pctv') - [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}") - install=kmod.install - - replaces+=( "lirc${_kernelname}" "lirc-libre${_kernelname}") - conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") - provides+=( "lirc${_kernelname}=${pkgver}" "lirc-libre${_kernelname}=${pkgver}") - - cd "${srcdir}/lirc-${_pkgver}/drivers" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install - gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko -} -if [[ -n "$_kernelname" ]]; then - eval "package() { _package_lirc; }" -else - eval "package_${_pkgname}() { _package_lirc; }" -fi - -package_lirc-utils-parabola() { - pkgdesc="Linux Infrared Remote Control utilities" - depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') - optdepends=('python2: pronto2lirc utility') - options=('strip') - backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') - - replaces=( 'lirc-utils' 'lirc-utils-libre') - conflicts=('lirc-utils' 'lirc-utils-libre') - provides=( "lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") - install=kmod.install - - cd "${srcdir}/lirc-${_pkgver}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service - install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf - - cp -rp remotes "${pkgdir}/usr/share/lirc" - chmod -R go-w "${pkgdir}/usr/share/lirc/" - - # install the logrotate config - install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - - # remove built modules - rm -r "${pkgdir}/usr/lib/modules" -} diff --git a/libre/lirc-parabola-lts/irexec.service b/libre/lirc-parabola-lts/irexec.service deleted file mode 100644 index dffbbf5e0..000000000 --- a/libre/lirc-parabola-lts/irexec.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=LIRC command handler -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/irexec --daemon - -[Install] -WantedBy=multi-user.target -Wants=lircd.service diff --git a/libre/lirc-parabola-lts/kmod.install b/libre/lirc-parabola-lts/kmod.install deleted file mode 100644 index d4bd8cb34..000000000 --- a/libre/lirc-parabola-lts/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/lirc-parabola-lts/lirc-utils.install b/libre/lirc-parabola-lts/lirc-utils.install deleted file mode 100644 index f7faa07eb..000000000 --- a/libre/lirc-parabola-lts/lirc-utils.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - systemd-tmpfiles --create lirc.conf -} - -post_upgrade() { - post_install - - if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then - echo ':: lirc.service and lircm.service have been replaced' - echo ' by the upstream unit files lircd.service and' - echo ' lircmd.service.' - fi -} diff --git a/libre/lirc-parabola-lts/lirc.logrotate b/libre/lirc-parabola-lts/lirc.logrotate deleted file mode 100644 index 623c4f328..000000000 --- a/libre/lirc-parabola-lts/lirc.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/lircd { - missingok - notifempty - delaycompress -} diff --git a/libre/lirc-parabola-lts/lirc.tmpfiles b/libre/lirc-parabola-lts/lirc.tmpfiles deleted file mode 100644 index 0b80e2e47..000000000 --- a/libre/lirc-parabola-lts/lirc.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/lirc 0755 root root - diff --git a/libre/lirc-parabola-lts/wpc8769l-build-fix.patch b/libre/lirc-parabola-lts/wpc8769l-build-fix.patch deleted file mode 100644 index 5e25693ab..000000000 --- a/libre/lirc-parabola-lts/wpc8769l-build-fix.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -index 790efa2..4248fe9 100644 ---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c -+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -@@ -51,17 +51,13 @@ - #include <linux/irq.h> - - #include <linux/acpi.h> -+#include <linux/types.h> - - #include <linux/platform_device.h> -+#include <asm-generic/bitops/find.h> - --#include "drivers/kcompat.h" --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) --#include <media/lirc.h> --#include <media/lirc_dev.h> --#else --#include "drivers/lirc.h" --#include "drivers/lirc_dev/lirc_dev.h" --#endif -+#include "media/lirc_dev.h" -+#include "media/lirc.h" - - #include "lirc_wpc8769l.h" - -@@ -105,11 +101,11 @@ static unsigned int baseport2; - static unsigned int irq; - - /* Debugging flag. */ --static int debug; -+static bool debug; - - /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and - * IRQ. */ --static int skip_probe; -+static bool skip_probe; - - /* Whether the device is open or not. */ - static int lirc_wpc8769l_is_open; -@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - size = count << 3; - - ldata = (unsigned long *) data_buf; -- next_one = generic_find_next_le_bit(ldata, size, 0); -+ next_one = find_next_bit(ldata, size, 0); - - if (next_one > 0) - put_pulse_bit(next_one - * WPC8769L_USECS_PER_BIT); - - while (next_one < size) { -- next_zero = generic_find_next_zero_le_bit(ldata, -+ next_zero = find_next_zero_bit(ldata, - size, next_one + 1); - - put_space_bit( -@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - * WPC8769L_USECS_PER_BIT); - - if (next_zero < size) { -- next_one = generic_find_next_le_bit(ldata, -+ next_one = find_next_bit(ldata, - size, next_zero + 1); - - put_pulse_bit( -@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void) - #ifdef MODULE - static struct platform_device *lirc_wpc8769l_platform_dev; - --static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) -+static int lirc_wpc8769l_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) -+static int lirc_wpc8769l_remove(struct platform_device *dev) - { - return 0; - } -@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device *dev) - - static struct platform_driver lirc_wpc8769l_platform_driver = { - .probe = lirc_wpc8769l_probe, -- .remove = __devexit_p(lirc_wpc8769l_remove), -+ .remove = lirc_wpc8769l_remove, - .suspend = lirc_wpc8769l_suspend, - .resume = lirc_wpc8769l_resume, - .driver = { diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD index 6892f9a8a..d5f36b531 100644 --- a/libre/lirc-parabola/PKGBUILD +++ b/libre/lirc-parabola/PKGBUILD @@ -4,25 +4,30 @@ # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Márcio Silva <coadde@parabola.nu> -# Kernel info + _basekernel=3.16 _kernelname= -# Source info _pkgname=lirc-parabola${_kernelname} -# Only build lirc-utils once; for the stock kernel -if [[ -n "${_kernelname}" ]]; then - pkgname=$_pkgname -else - pkgbase=$_pkgname - pkgname=("$_pkgname" lirc-utils-parabola) -fi - +pkgbase=$_pkgname +pkgname=("$_pkgname" lirc-utils-parabola) _pkgver=0.9.1a [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" - +pkgrel=3.2 +epoch=1 +_extramodules=extramodules-${_basekernel}${_kernelname} +arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') +# NOTICE: Don't forget to bump version in depends in package_lirc()! +makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') + +# Generic (you shouldn't have to modify any of these variables) +_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) +makedepends+=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}" + "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") + +options=('!makeflags' '!strip') source=("http://prdownloads.sourceforge.net/lirc/lirc-${_pkgver}.tar.bz2" "wpc8769l-build-fix.patch" lirc-0.9.1a-fix-segfaults.patch @@ -36,19 +41,6 @@ md5sums=('1f1fac162ed309dd50f307e96a292957' '32df3b9bc859565d6acf5f0e5b747083' 'febf25c154a7d36f01159e84f26c2d9a') -# Package info -pkgrel=3.${_basekernel/./} -epoch=1 -arch=('i686' 'x86_64' 'mips64el') -options=('!makeflags' '!strip') -makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') - -# Generic (you shouldn't have to modify any of these variables) -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -makedepends+=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}" - "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") - prepare() { cd "${srcdir}/lirc-${_pkgver}" @@ -83,32 +75,26 @@ build() { make } -_package_lirc() { +_package_lirc-parabola() { pkgdesc="Linux Infrared Remote Control kernel modules (built for the linux-libre${_kernelname} kernel package)" - depends=('lirc-libre-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") + depends=('lirc-utils' "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") replaces=('lirc+pctv') - [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}") install=kmod.install - - replaces+=( "lirc${_kernelname}" "lirc-libre${_kernelname}") - conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") - provides+=( "lirc${_kernelname}=${pkgver}" "lirc-libre${_kernelname}=${pkgver}") + replaces+=("lirc${_kernelname}" "lirc-libre${_kernelname}") + conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}") + provides+=("lirc${_kernelname}=${pkgver}") cd "${srcdir}/lirc-${_pkgver}/drivers" + make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install + gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko + # Set the correct extramodules directory for install cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install - gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko + sed -i "s/^_EXTRAMODULES=$/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}" } -if [[ -n "$_kernelname" ]]; then - eval "package() { _package_lirc; }" -else - eval "package_${_pkgname}() { _package_lirc; }" -fi +eval "package_${_pkgname}() { _package_lirc-parabola; }" package_lirc-utils-parabola() { pkgdesc="Linux Infrared Remote Control utilities" @@ -116,11 +102,10 @@ package_lirc-utils-parabola() { optdepends=('python2: pronto2lirc utility') options=('strip') backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') - - replaces=( 'lirc-utils' 'lirc-utils-libre') - conflicts=('lirc-utils' 'lirc-utils-libre') - provides=( "lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") - install=kmod.install + replaces=('lirc-utils' 'lirc-libre-utils') + conflicts=('lirc-utils' 'lirc-libre-utils') + provides=("lirc-utils=$pkgver") + install=lirc-utils.install cd "${srcdir}/lirc-${_pkgver}" @@ -138,3 +123,5 @@ package_lirc-utils-parabola() { # remove built modules rm -r "${pkgdir}/usr/lib/modules" } + +# vim: ts=2 sw=2 et: diff --git a/libre/lirc-parabola/kmod.install b/libre/lirc-parabola/kmod.install index d4bd8cb34..40caa464f 100644 --- a/libre/lirc-parabola/kmod.install +++ b/libre/lirc-parabola/kmod.install @@ -1,14 +1,14 @@ +_EXTRAMODULES= + post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) + echo ">>> Updating module dependencies. Please wait ..." + depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1 } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } - -# vim: ts=2 sw=2 et: diff --git a/libre/luxrays-parabola/PKGBUILD b/libre/luxrays-parabola/PKGBUILD new file mode 100644 index 000000000..8edc9ff17 --- /dev/null +++ b/libre/luxrays-parabola/PKGBUILD @@ -0,0 +1,81 @@ +# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Maintainer: Márcio Silva <ecoadde@parabola.nu> +_pkgname=('luxrays' 'luxmark') +#pkgname=('luxrays-parabola' 'luxmark-parabola') +pkgname=('luxrays-parabola') +pkgver=1.3.1 +_pkgver=7459cd8a9583 +pkgrel=5 +pkgdesc="Accelerate the ray intersection process by using CPUs" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.luxrender.net/" +license=('GPL') +#depends=('freeimage' 'libcl' 'libgl') +depends=('freeimage' 'libgl') +#makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4') +makedepends=('cmake' 'boost' 'mesa' 'glew' 'freeglut' 'qt4') +options=('staticlibs') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ + luxmark_scenes_path.diff QTBUG-22829.diff) +md5sums=('859999e5e07550553fb310a7f48530a4' + '1fd2a6f32e2822b5e0f147304292a1b9' + '6e20ee7ea64c578431d51065d0871abc') + +prepare() { + cd "$srcdir/luxrender-luxrays-$_pkgver" + + # change the path to luxmark scenes + patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true + + # workaround QTBUG-22829 (moc doesn't work with boost headers) + patch -Np1 < "$srcdir/QTBUG-22829.diff" || true +} + +build() { + cd "$srcdir/luxrender-luxrays-$_pkgver" + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + -DBUILD_LUXMARK=ON \ + . + make +} + +package_luxrays-parabola() { + provides=("${_pkgname[0]}=${pkgver}") + conflicts=("${_pkgname[0]}") + replaces=("${_pkgname[0]}") + optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' + 'boost-libs: demos (SmallLuxGPU etc.)') + + cd "$srcdir/luxrender-luxrays-$_pkgver" + + install -d -m755 "$pkgdir"/usr/{bin,include,lib} + install -m755 bin/* "$pkgdir"/usr/bin + install -m644 lib/* "$pkgdir"/usr/lib + cp -a include "$pkgdir"/usr + + # remove luxmark (packaged separately) + #rm "$pkgdir"/usr/bin/luxmark +} + +package_luxmark-parabola() { + pkgdesc="OpenCL benchmark tool" + depends+=("${depends[@]}" 'boost-libs' 'qt4') + provides=("${_pkgname[1]}=${pkgver}") + conflicts=("${_pkgname[1]}") + replaces=("${_pkgname[1]}") + + cd "$srcdir/luxrender-luxrays-$_pkgver" + install -d -m755 "$pkgdir"/usr/{bin,share/luxmark} + #install -m755 bin/luxmark "$pkgdir"/usr/bin + + # install scenes (only luxball is working ATM) + cp -a samples/luxmark/scenes/luxball "$pkgdir"/usr/share/luxmark + # fix the paths + sed -i 's|scenes/|/usr/share/luxmark/|' "$pkgdir"/usr/share/luxmark/*/*.cfg "$pkgdir"/usr/share/luxmark/*/*.scn +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/luxrays-parabola/QTBUG-22829.diff b/libre/luxrays-parabola/QTBUG-22829.diff new file mode 100644 index 000000000..5625856bf --- /dev/null +++ b/libre/luxrays-parabola/QTBUG-22829.diff @@ -0,0 +1,17 @@ +diff -rup luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h +--- luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h 2013-10-16 11:16:00.000000000 +0200 ++++ luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h 2013-10-30 20:29:36.768650444 +0100 +@@ -41,11 +41,13 @@ + #include "luxrays/core/utils.h" + #include "luxrays/utils/atomic.h" + ++#ifndef Q_MOC_RUN + #include "slg/slg.h" + #include "slg/rendersession.h" + #include "slg/renderconfig.h" + #include "slg/sdl/scene.h" + #include "slg/film/film.h" ++#endif + + #include "mainwindow.h" + diff --git a/libre/luxrays-parabola/luxmark_scenes_path.diff b/libre/luxrays-parabola/luxmark_scenes_path.diff new file mode 100644 index 000000000..80f909a05 --- /dev/null +++ b/libre/luxrays-parabola/luxmark_scenes_path.diff @@ -0,0 +1,20 @@ +diff -rup luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h +--- luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h 2013-02-22 22:29:42.000000000 +0100 ++++ luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h 2013-06-24 14:54:12.946992718 +0200 +@@ -36,11 +36,11 @@ + //------------------------------------------------------------------------------ + + // List of supported scenes +-#define SCENE_ROOM "scenes/room/render.cfg" +-#define SCENE_SALA "scenes/sala/render.cfg" +-#define SCENE_LUXBALL_HDR "scenes/luxball/render-hdr.cfg" +-#define SCENE_LUXBALL "scenes/luxball/render.cfg" +-#define SCENE_LUXBALL_SKY "scenes/luxball/render-sunset.cfg" ++#define SCENE_ROOM "/usr/share/luxmark/room/render.cfg" ++#define SCENE_SALA "/usr/share/luxmark/sala/render.cfg" ++#define SCENE_LUXBALL_HDR "/usr/share/luxmark/luxball/render-hdr.cfg" ++#define SCENE_LUXBALL "/usr/share/luxmark/luxball/render.cfg" ++#define SCENE_LUXBALL_SKY "/usr/share/luxmark/luxball/render-sunset.cfg" + + class LuxMarkApp : public QApplication { + Q_OBJECT diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD deleted file mode 100644 index e44692544..000000000 --- a/libre/luxrender-libre/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 111294 2014-05-16 08:45:03Z stativ $ -# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Arch): flixie <69one@gmx.net> -# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer: Márcio Silva <coadde@parabola.nu> -_pkgname=luxrender -pkgname=$_pkgname-libre -pkgver=1.3.1 -_pkgver=d0b0e20c47cc -pkgrel=8 -pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.$_pkgname.net/" -license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw') -optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \ - 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') -provides=($_pkgname=$pkgver) -conflicts=($_pkgname) -replaces=($_pkgname) -source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 \ - force_python3.diff) -md5sums=('cbe749f56a1e1976745f5458100efa8a' - '42692e65eabc5828693e2682e94b7c64') - -prepare() { - cd "$srcdir"/$_pkgname-lux-$_pkgver - - patch -Np1 < "$srcdir/force_python3.diff" || true -} - -build() { - cd "$srcdir"/$_pkgname-lux-$_pkgver - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \ - . - make -} - -package() { - cd "$srcdir"/$_pkgname-lux-$_pkgver - make DESTDIR="$pkgdir" install - - # fix library path on 64bit - [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - - #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.4/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender-parabola/PKGBUILD b/libre/luxrender-parabola/PKGBUILD new file mode 100644 index 000000000..e9f32284c --- /dev/null +++ b/libre/luxrender-parabola/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor (Arch): flixie <69one@gmx.net> +# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> +# Maintainer: Márcio Silva <coadde@parabola.nu> +_pkgname=luxrender +pkgname=$_pkgname-parabola +pkgver=1.3.1 +_pkgver=d0b0e20c47cc +pkgrel=10 +pkgdesc='Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation' +arch=('i686' 'x86_64' 'mips64el') +url="http://www.$_pkgname.net/" +license=('GPL') +#depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw') +depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libgl' 'fftw') +optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' + 'python: pylux Python interface') +# luxrender is constantly broken to various GCC bugs, the latest one being FS#40596 +#makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' 'clang') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'clang') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname" "$_pkgname-libre") +replaces=("$_pkgname" "$_pkgname-libre") +source=("https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2" + "force_python3.diff") +md5sums=('cbe749f56a1e1976745f5458100efa8a' + '42692e65eabc5828693e2682e94b7c64') + +prepare() { + cd $srcdir/$_pkgname-lux-$_pkgver + + # fix library path on 64bit + sed -i '\|SET[(]LIB_SUFFIX 64[)]|d' CMakeLists.txt + + patch -Np1 < $srcdir/force_python3.diff || true + # workaround QTBUG-22829 + find . -type f -exec sed -i 's|^#include .*boost/.*|#ifndef Q_MOC_RUN\n&\n#endif|' '{}' ';' +} + +build() { + cd $srcdir/$_pkgname-lux-$_pkgver + + export CC=clang + export CXX=clang++ + + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \ + -DCMAKE_EXE_LINKER_FLAGS=-lpthread + make +} + +package() { + cd $srcdir/$_pkgname-lux-$_pkgver + make DESTDIR=$pkgdir install + + #install pylux + install -D -m644 pylux.so $pkgdir/usr/lib/python3.4/pylux.so +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-parabola/force_python3.diff index 1ee61e872..1ee61e872 100644 --- a/libre/luxrender-libre/force_python3.diff +++ b/libre/luxrender-parabola/force_python3.diff diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-parabola/PKGBUILD index 819b737df..6d2d9b2f9 100644 --- a/libre/pacman-mirrorlist-libre/PKGBUILD +++ b/libre/pacman-mirrorlist-parabola/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Esteban Carnevale <alfplayer@mailoo.org> # Maintainer: André Silva <emulatorman@parabola.nu> -pkgname=pacman-mirrorlist-libre +pkgname=pacman-mirrorlist-parabola pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman" @@ -13,8 +13,8 @@ license=('GPL') groups=('base') backup=(etc/pacman.d/mirrorlist) source=(mirrorlist-${pkgver}.txt::${url}) -conflicts=(pacman-mirrorlist) -replaces=(pacman-mirrorlist) +conflicts=(pacman-mirrorlist pacman-mirrorlist-libre) +replaces=(pacman-mirrorlist pacman-mirrorlist-libre) provides=(pacman-mirrorlist) package() { @@ -22,4 +22,4 @@ package() { install -m644 $srcdir/mirrorlist-${pkgver}.txt $pkgdir/etc/pacman.d/mirrorlist } -md5sums=('d9611e055969ee109b56026ed06e4919') +md5sums=('31c810b4eb182ee2d96243d65c8915df') diff --git a/libre/pacman/PKGBUILD b/libre/pacman-parabola/PKGBUILD index 774d45321..06f0737c8 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman-parabola/PKGBUILD @@ -3,7 +3,8 @@ # Maintainer (Arch): Dan McGee <dan@archlinux.org> # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> -pkgname=pacman +_pkgname=pacman +pkgname=pacman-parabola pkgver=4.1.2 pkgrel=6.1 pkgdesc="A library-based package manager with dependency support" @@ -15,12 +16,12 @@ depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'cacert-dot-org') checkdepends=('python2' 'fakechroot') optdepends=('fakeroot: for makepkg usage as normal user') -provides=('pacman-contrib') -conflicts=('pacman-contrib') -replaces=('pacman-contrib') +provides=('pacman-contrib' "$_pkgname=$pkgver") +conflicts=('pacman-contrib' "$_pkgname") +replaces=('pacman-contrib' "$_pkgname") backup=(etc/pacman.conf etc/makepkg.conf) options=('strip' 'debug') -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} +source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$pkgver.tar.gz{,.sig} pacman.conf.i686 pacman.conf.x86_64 pacman.conf.mips64el @@ -39,7 +40,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd' '093f0779ac55ae781ba028ad74b95f84') build() { - cd "$pkgname-$pkgver" + cd "$_pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-doc \ @@ -50,11 +51,11 @@ build() { } check() { - make -C "$pkgname-$pkgver" check + make -C "$_pkgname-$pkgver" check } package() { - cd "$pkgname-$pkgver" + cd "$_pkgname-$pkgver" make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" -C contrib install diff --git a/libre/pacman/gpg.conf b/libre/pacman-parabola/gpg.conf index 7fc6fc661..7fc6fc661 100644 --- a/libre/pacman/gpg.conf +++ b/libre/pacman-parabola/gpg.conf diff --git a/libre/pacman/makepkg.conf b/libre/pacman-parabola/makepkg.conf index 758d7d029..758d7d029 100644 --- a/libre/pacman/makepkg.conf +++ b/libre/pacman-parabola/makepkg.conf diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman-parabola/pacman.conf.i686 index 84cec630c..84cec630c 100644 --- a/libre/pacman/pacman.conf.i686 +++ b/libre/pacman-parabola/pacman.conf.i686 diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman-parabola/pacman.conf.mips64el index 604040640..604040640 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman-parabola/pacman.conf.mips64el diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman-parabola/pacman.conf.x86_64 index 03a8cf3a6..03a8cf3a6 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman-parabola/pacman.conf.x86_64 diff --git a/libre/pacman/refresh-pacman-keys b/libre/pacman-parabola/refresh-pacman-keys index e96dc34e5..e96dc34e5 100644 --- a/libre/pacman/refresh-pacman-keys +++ b/libre/pacman-parabola/refresh-pacman-keys diff --git a/libre/pacman/sks-keyservers.netCA.pem b/libre/pacman-parabola/sks-keyservers.netCA.pem index 24a2ad2e8..24a2ad2e8 100644 --- a/libre/pacman/sks-keyservers.netCA.pem +++ b/libre/pacman-parabola/sks-keyservers.netCA.pem diff --git a/libre/spectrwm-libre/LICENSE b/libre/spectrwm-parabola/LICENSE index 24c04f3a0..24c04f3a0 100644 --- a/libre/spectrwm-libre/LICENSE +++ b/libre/spectrwm-parabola/LICENSE diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-parabola/PKGBUILD index ed632759b..082f189c5 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-parabola/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110857 2014-05-08 17:25:29Z kkeen $ +# $Id: PKGBUILD 117835 2014-08-24 14:10:25Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm -pkgname=spectrwm-libre -pkgver=2.5.1 +pkgname=spectrwm-parabola +pkgver=2.6.0 pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -12,19 +12,25 @@ url="http://www.spectrwm.org" _watch="https://opensource.conformal.com/snapshots/spectrwm/" license=('custom:ISC') depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor') -replaces=('spectrwm' 'scrotwm') -conflicts=('spectrwm') +replaces=('spectrwm' 'scrotwm' 'spectrwm-libre') +conflicts=('spectrwm' 'spectrwm-libre') provides=("spectrwm=$pkgver") makedepends=('libxt') optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font') backup=(etc/spectrwm.conf) + +# the 2.6.0 linux makefile does not build +# so download and use the 2.5.1 makefile until this is fixed + source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ + http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-2.5.1.tgz \ LICENSE \ baraction.sh \ spectrwm-no-preload) -md5sums=('d9aec3342920e31cbe60f1032571043a' +md5sums=('278acafe23d2fa2b1d7a3705bcbe95de' + 'd9aec3342920e31cbe60f1032571043a' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' '974d109ce0af39cc73936d5efd682480') @@ -33,7 +39,7 @@ build() { cd "$srcdir/$_pkgname-$pkgver" sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c - sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c + sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf # crashes if defaults can't be found, use less massive defaults sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf @@ -43,6 +49,7 @@ build() { sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c cd linux + cp "$srcdir/$_pkgname-2.5.1/linux/Makefile" ./ make PREFIX="/usr" } diff --git a/libre/spectrwm-libre/baraction.sh b/libre/spectrwm-parabola/baraction.sh index 96a8a7b1a..96a8a7b1a 100644 --- a/libre/spectrwm-libre/baraction.sh +++ b/libre/spectrwm-parabola/baraction.sh diff --git a/libre/spectrwm-libre/spectrwm-no-preload b/libre/spectrwm-parabola/spectrwm-no-preload index 12385eddb..12385eddb 100644 --- a/libre/spectrwm-libre/spectrwm-no-preload +++ b/libre/spectrwm-parabola/spectrwm-no-preload diff --git a/libre/tp_smapi-parabola-grsec/PKGBUILD b/libre/tp_smapi-parabola-grsec/PKGBUILD deleted file mode 100644 index 3db1aa984..000000000 --- a/libre/tp_smapi-parabola-grsec/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 116831 2014-08-04 07:32:08Z tpowa $ -# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor (Arch): xduugu -# Contributor (Arch): nh2 -# Contributor (Arch): Steven Davidovitz <steviedizzle ð gmail đ com> -# Contributor (Arch): Nick B <Shirakawasuna ð gmail đ com> -# Contributor (Arch): Christof Musik <christof ð senfdax đ de> -# Contributor (Arch): Stefan Rupp <archlinux ð stefanrupp đ de> -# Contributor (Arch): Ignas Anikevicius <anikevicius ð gmail đ com> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.15 -_kernelname=-grsec - -# Source info -_pkgname=tp_smapi -pkgver=0.41 -pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre${_kernelname} kernel package)" -url='https://github.com/evgeni/tp_smapi' -license=('GPL') -source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") -md5sums=('63c683415c764568f6bf17c7eabe4752') - -# Package info -pkgrel=53.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -install='kmod.install' - -# Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ - -e "s#^(KBASE\s*:=).*\$#\1 /usr/lib/modules/${_kernver}#" Makefile - - make HDAPS=1 -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - # Actually install - make -C "/usr/lib/modules/${_kernver}/build" \ - INSTALL_MOD_PATH="${pkgdir}/usr" \ - M="${srcdir}/${_pkgname}-${pkgver}" modules_install - - cd "${pkgdir}/usr/lib/modules" - mv "${_kernver}/extra" "${_extramodules}" - rmdir "${_kernver}" - - # compress kernel modules - find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + - - # load module on startup - install -dm 755 "${pkgdir}/usr/lib/modules-load.d" - echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" -} diff --git a/libre/tp_smapi-parabola-grsec/kmod.install b/libre/tp_smapi-parabola-grsec/kmod.install deleted file mode 100644 index d4bd8cb34..000000000 --- a/libre/tp_smapi-parabola-grsec/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/tp_smapi-parabola-lts/PKGBUILD b/libre/tp_smapi-parabola-lts/PKGBUILD index 5a64013b2..99678a074 100644 --- a/libre/tp_smapi-parabola-lts/PKGBUILD +++ b/libre/tp_smapi-parabola-lts/PKGBUILD @@ -25,7 +25,7 @@ source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.t md5sums=('63c683415c764568f6bf17c7eabe4752') # Package info -pkgrel=53.${_basekernel/./} +pkgrel=29 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' @@ -35,9 +35,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi-parabola/PKGBUILD index 3f1818f6b..8f73ab13f 100644 --- a/libre/tp_smapi-parabola/PKGBUILD +++ b/libre/tp_smapi-parabola/PKGBUILD @@ -25,7 +25,7 @@ source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.t md5sums=('63c683415c764568f6bf17c7eabe4752') # Package info -pkgrel=53.${_basekernel/./} +pkgrel=52.1 arch=('i686' 'x86_64' 'mips64el') install='kmod.install' @@ -35,9 +35,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/vhba-module-parabola-grsec/60-vhba.rules b/libre/vhba-module-parabola-grsec/60-vhba.rules deleted file mode 100644 index 39ae3a4ec..000000000 --- a/libre/vhba-module-parabola-grsec/60-vhba.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess" diff --git a/libre/vhba-module-parabola-grsec/PKGBUILD b/libre/vhba-module-parabola-grsec/PKGBUILD deleted file mode 100644 index eb0e9214e..000000000 --- a/libre/vhba-module-parabola-grsec/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 116828 2014-08-04 07:19:43Z tpowa $ -# Maintainer (Arch): Ray Rashif <schiv@archlinux.org> -# Contributor (Arch): Mateusz Herych <heniekk@gmail.com> -# Contributor (Arch): Charles Lindsay <charles@chaoslizard.org> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.15 -_kernelname=-grsec - -# Source info -_pkgname=vhba-module -pkgver=20140629 -pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre${_kernelname} kernel package)" -url="http://cdemu.sourceforge.net/" -license=('GPL') -source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2" - '60-vhba.rules') -md5sums=('6b307a80df9c163768cc7ecb3ccebb71' - '4dc37dc348b5a2c83585829bde790dcc') - -# Package info -pkgrel=7.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -options=(!makeflags) -install=$_pkgname.install - -# Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KDIR=/usr/lib/modules/$_kernver/build -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - # Actually install - install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" -} diff --git a/libre/vhba-module-parabola-grsec/vhba-module.install b/libre/vhba-module-parabola-grsec/vhba-module.install deleted file mode 100644 index 04d26b27b..000000000 --- a/libre/vhba-module-parabola-grsec/vhba-module.install +++ /dev/null @@ -1,20 +0,0 @@ -_updatemod() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_install() { - getent group cdemu &>/dev/null || groupadd -r cdemu - _updatemod -} - -post_upgrade() { - post_install -} - -post_remove() { - _updatemod - groupdel cdemu -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/vhba-module-parabola-lts/60-vhba.rules b/libre/vhba-module-parabola-lts/60-vhba.rules deleted file mode 100644 index 39ae3a4ec..000000000 --- a/libre/vhba-module-parabola-lts/60-vhba.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess" diff --git a/libre/vhba-module-parabola-lts/PKGBUILD b/libre/vhba-module-parabola-lts/PKGBUILD deleted file mode 100644 index d6f99bef9..000000000 --- a/libre/vhba-module-parabola-lts/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 116828 2014-08-04 07:19:43Z tpowa $ -# Maintainer (Arch): Ray Rashif <schiv@archlinux.org> -# Contributor (Arch): Mateusz Herych <heniekk@gmail.com> -# Contributor (Arch): Charles Lindsay <charles@chaoslizard.org> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Márcio Silva <coadde@parabola.nu> - -# Kernel info -_basekernel=3.14 -_kernelname=-lts - -# Source info -_pkgname=vhba-module -pkgver=20140629 -pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre${_kernelname} kernel package)" -url="http://cdemu.sourceforge.net/" -license=('GPL') -source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2" - '60-vhba.rules') -md5sums=('6b307a80df9c163768cc7ecb3ccebb71' - '4dc37dc348b5a2c83585829bde790dcc') - -# Package info -pkgrel=7.${_basekernel/./} -arch=('i686' 'x86_64' 'mips64el') -options=(!makeflags) -install=$_pkgname.install - -# Generic (you shouldn't have to modify any of these variables) -pkgname=${_pkgname}-parabola${_kernelname} -_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -_extramodules=extramodules-${_basekernel}${_kernelname} -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability -if [[ -n "${_kernelname}" ]]; then - provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname -fi - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KDIR=/usr/lib/modules/$_kernver/build -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}" - - # Actually install - install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" -} diff --git a/libre/vhba-module-parabola-lts/vhba-module.install b/libre/vhba-module-parabola-lts/vhba-module.install deleted file mode 100644 index 04d26b27b..000000000 --- a/libre/vhba-module-parabola-lts/vhba-module.install +++ /dev/null @@ -1,20 +0,0 @@ -_updatemod() { - _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD - depmod $(cat /usr/lib/modules/${_extramodules}/version) -} - -post_install() { - getent group cdemu &>/dev/null || groupadd -r cdemu - _updatemod -} - -post_upgrade() { - post_install -} - -post_remove() { - _updatemod - groupdel cdemu -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/vhba-module-parabola/PKGBUILD b/libre/vhba-module-parabola/PKGBUILD index a5b0f3fa2..aa392ecb8 100644 --- a/libre/vhba-module-parabola/PKGBUILD +++ b/libre/vhba-module-parabola/PKGBUILD @@ -22,7 +22,7 @@ md5sums=('6b307a80df9c163768cc7ecb3ccebb71' '4dc37dc348b5a2c83585829bde790dcc') # Package info -pkgrel=7.${_basekernel/./} +pkgrel=6.1 arch=('i686' 'x86_64' 'mips64el') options=(!makeflags) install=$_pkgname.install @@ -33,9 +33,9 @@ _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) _extramodules=extramodules-${_basekernel}${_kernelname} depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") -replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability -conflicts=("${_pkgname}${_kernelname}") # for Arch-compatability -provides=( "${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatability +replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility +provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility if [[ -n "${_kernelname}" ]]; then provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname fi diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index a11a35ff7..96ee5047c 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') #url="https://projects.parabolagnulinux.org/blacklist.git" url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20140817 -_gitver=4b2765f8595a8d607e22f8efc49bf172755ecab1 +pkgver=20140824 +_gitver=8f7fa8c6c7a4b97b7804d523b250423004444815 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) #source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt?id=${_gitver}) source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('001bc46b66ad36ba9a7a2c0bce7a6fb1') +md5sums=('5fb3ef4347dc04f255b6a3ceb3e32068') package() { cd "$srcdir" |