diff options
38 files changed, 414 insertions, 887 deletions
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index 585d43e21..feb55814c 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock # Build stock knock kernel _pkgbasever=3.18-gnu -_pkgver=3.18.2-gnu +_pkgver=3.18.3-gnu _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -19,7 +19,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="https://gnunet.org/knock" license=('GPL2') @@ -42,7 +42,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '6ebb37b925d8d523a0d00450583dad3736287d8a1b6df05c90e66b8c6cc0fd57' + '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index a6013b487..9610f872b 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel _pkgbasever=3.14-gnu -_pkgver=3.14.28-gnu +_pkgver=3.14.29-gnu _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -45,12 +45,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '8b1208650399e973c6c39e839f8480ad1b27feb775d5c7bdba0d529422cc6f7d' + '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' - '6f92d1d5114b3fa58a8e6694324b7e88ee8eacb47c7e48bfa64a382e5ba275a1' - '81c5662abbec12cbcabe794b1ce0d393238930889760b96c982a4e0a038dc239' + 'd092751bdc1070477678a4abb43c5c8268b0351003701fc63b76a994cf4fc603' + '857af92380d01da2c5c3561f129d26ebaf3a772297ff6d6347bdcf30e0788482' '2056d30f799c34f5d9114517cb1fdcba806f8b9477431a260abd4322af8c79aa' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' diff --git a/kernels/linux-libre-lts-knock/config.i686 b/kernels/linux-libre-lts-knock/config.i686 index 5d9a91071..a2cfead3e 100644 --- a/kernels/linux-libre-lts-knock/config.i686 +++ b/kernels/linux-libre-lts-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.19-gnu-1-lts-knock Kernel Configuration +# Linux/x86 3.14.21-gnu-1-lts-knock Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -460,7 +460,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m diff --git a/kernels/linux-libre-lts-knock/config.x86_64 b/kernels/linux-libre-lts-knock/config.x86_64 index e371edae1..3649dc256 100644 --- a/kernels/linux-libre-lts-knock/config.x86_64 +++ b/kernels/linux-libre-lts-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.19-gnu-1-lts-knock Kernel Configuration +# Linux/x86 3.14.21-gnu-1-lts-knock Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -469,7 +469,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 8625a9bd4..48a19b973 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.18-gnu -_pkgver=3.18.2-gnu +_pkgver=3.18.3-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -18,7 +18,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -37,7 +37,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '6ebb37b925d8d523a0d00450583dad3736287d8a1b6df05c90e66b8c6cc0fd57' + '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' 'SKIP' '8d255e4551bb88252ede8cc0f5046794372076da6bd97582229172537f0cc922' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index bf45dfa0d..7388a5e64 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-rt # Build stock -rt kernel _pkgbasever=3.14-gnu -_pkgver=3.14.25-gnu +_pkgver=3.14.29-gnu _rtbasever=3.14 -_rtpatchver=rt22 +_rtpatchver=rt26 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz" - "patch-${_pkgver%-*}-${_rtpatchver}.patch.xz.sign::http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign" + #"patch-${_pkgver%-*}-${_rtpatchver}.patch.xz.sign::http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign" # the main kernel config files 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk @@ -49,10 +49,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - 'f44e90fa5782728e648996cb2d068bdb27372e029b424ba87904606850743679' - 'SKIP' - '0423a2c2ed35b5df5983b517bf2a1a7495e67803a309479b8af613dd2a47da53' + '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' 'SKIP' + 'd4713a9e41b15ca59bdd5acd37479b609e8ea0b604c66dda7a81de9350be15e1' + #'SKIP' '3bfd1d22915bb891a6826f45d3f4f636ddc9f0476dbffff3e650f900f681399d' 'd9b1276ffaa8b4e0d08c8d47114e90167e6c0107764d6004b48a27079efcc40c' 'f84a820e603b0fa980b6b53a36a84383d2d851539aeaaac9fb72c962e3ee1975' @@ -68,7 +68,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt + #'5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt ) _kernelname=${pkgbase#linux-libre} diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 7987e1ebe..390feab1b 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-xen # Build stock -xen kernel _pkgbasever=3.18-gnu -_pkgver=3.18.2-gnu +_pkgver=3.18.3-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -18,7 +18,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -37,7 +37,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '6ebb37b925d8d523a0d00450583dad3736287d8a1b6df05c90e66b8c6cc0fd57' + '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' 'SKIP' '345716983e32033e17967cb0b3a2a13bbe3aa2ccdc39ab165cb0ee7c01310e47' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' diff --git a/libre/hydrogen/PKGBUILD b/libre/hydrogen/PKGBUILD index b2cf267e7..c4c35c76d 100644 --- a/libre/hydrogen/PKGBUILD +++ b/libre/hydrogen/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 219544 2014-08-11 12:03:56Z schiv $ +# $Id: PKGBUILD 229588 2015-01-19 16:59:30Z schiv $ # Maintainer (Arch): Ray Rashif <schiv@archlinux.org> # Contributor (Arch): tobias <tobias@archlinux.org> # Contributor (Arch): see .contrib # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=hydrogen -pkgver=0.9.6 -pkgrel=1.parabola2 +pkgver=0.9.6.1 +pkgrel=1.parabola1 pkgdesc="An advanced drum machine, without nonfree drumkits recommendation" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,28 +16,16 @@ optdepends=('rubberband') makedepends=('cmake') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz" - 'lrdf_raptor2.patch') +source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz") install=$pkgname.install -md5sums=('e4424926a88af82fb2048b3548723827' - '6f15bc059d3c39e9c34e0fbac92baf61') +md5sums=('527a44eec22fd31f55e6b3cf1089613d') prepare() { cd "$srcdir/$pkgname-$pkgver" - # Change to list with only free licensed drumkits + # Change to list with free licensed drumkits only sed -i -e 's|www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php|repo.parabola.nu/other/hydrogen-libre/feeds/drumkit_list.php|'\ $(grep -rlI 'www[.]hydrogen-music[.]org/feeds/drumkit_list[.]php') - - # fix building with newer raptor - # see https://bugs.archlinux.org/task/25060 - # see https://github.com/hydrogen-music/hydrogen/issues/194 - patch -Np1 -i "$srcdir/lrdf_raptor2.patch" - - # fix some pngs that break with newer libpng - # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html - #msg2 "Fixing PNGs, please wait..." - #find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { diff --git a/libre/hydrogen/lrdf_raptor2.patch b/libre/hydrogen/lrdf_raptor2.patch deleted file mode 100644 index efec16700..000000000 --- a/libre/hydrogen/lrdf_raptor2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -baur hydrogen-0.9.6.orig/CMakeLists.txt hydrogen-0.9.6/CMakeLists.txt ---- hydrogen-0.9.6.orig/CMakeLists.txt 2014-08-11 15:10:25.960752930 +0600 -+++ hydrogen-0.9.6/CMakeLists.txt 2014-08-11 17:01:48.001219876 +0600 -@@ -193,6 +193,9 @@ - FIND_HELPER(PULSEAUDIO pulseaudio pulse/pulseaudio.h pulse) - FIND_HELPER(LASH lash-1.0 lash/lash.h lash) - FIND_HELPER(LRDF lrdf lrdf.h lrdf) -+IF(LRDF_FOUND) -+ include_directories(${LRDF_INCLUDE_DIRS}) -+ENDIF(LRDF_FOUND) - FIND_HELPER(RUBBERBAND rubberband RubberBandStretcher.h rubberband) - FIND_HELPER(CPPUNIT cppunit cppunit/TestCase.h cppunit) - # CHECK FOR Qt4 diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD new file mode 100644 index 000000000..93fb10f71 --- /dev/null +++ b/libre/kodi/PKGBUILD @@ -0,0 +1,132 @@ +# vim:set ts=2 sw=2 et: +# $Id: PKGBUILD 125111 2015-01-01 08:46:41Z idevolder $ +# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> +# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> +# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor (Arch): Maxime Gauduin <alucryd@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +_prefix=/usr + +_pkgbase=kodi-libre +pkgbase=kodi +pkgname=kodi +pkgver=14.0 +_codename=Helix +pkgrel=1.parabola1 +arch=('i686' 'x86_64') +url="http://kodi.tv" +license=('GPL2') +makedepends=( + 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew' + 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass' + 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' + 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva' + 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' + 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image' + 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip' +) +mksource=( + "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" +) +source=( + "https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-$_codename.tar.gz" +) +mksha256sums=( + '11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192' +) +sha256sums=( + '137f025af7f6527417c05894de7830b41ce43557bb9d24ad3bd33f99e456acbd' +) + +mksource() { + cd "$srcdir/xbmc-$pkgver-$_codename" + + msg2 "remove nonfree unRAR utility files from the source" + rm -rv lib/UnrarXLib +} + +prepare() { + cd "$srcdir/xbmc-$pkgver-$_codename" + + find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + + sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl + sed 's/python/python2/' -i tools/Linux/kodi.sh.in + msg2 "Use addons.xml from Parabola server (without nonfree addons support)" + sed -i -e 's|mirrors[.]kodi[.]tv/addons/gotham/addons.xml|repo.parabola.nu/other/kodi-libre/addons/gotham/addons.xml|' addons/repository.xbmc.org/addon.xml + sed -i -e 's|mirrors[.]kodi[.]tv/addons/helix/addons.xml|repo.parabola.nu/other/kodi-libre/addons/helix/addons.xml|' addons/repository.xbmc.org/addon.xml + sed -i -e 's|mirrors[.]kodi[.]tv/addons/frodo/addons.xml|repo.parabola.nu/other/kodi-libre/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml +} + +build() { + cd "$srcdir/xbmc-$pkgver-$_codename" + + # Bootstrapping + MAKEFLAGS=-j1 ./bootstrap + + #./configure --help + #return 1 + + # Configuring XBMC + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-debug \ + --enable-optimizations \ + --enable-libbluray \ + --enable-texturepacker \ + --enable-external-libraries \ + --with-lirc-device=/run/lirc/lircd \ + --disable-non-free + + # Now (finally) build + make +} + +package_kodi() { + pkgdesc="A software media player and entertainment hub for digital media, without nonfree decompression engine for RAR archives and support for nonfree addons" + + # depends expected for kodi plugins: + # 'python2-pillow' 'python2-pybluez' 'python2-simplejson' + # depends expeced in FEH.py + # 'mesa-demos' 'xorg-xdpyinfo' + depends=( + 'python2-pillow' 'python2-pybluez' 'python2-simplejson' + 'mesa-demos' 'xorg-xdpyinfo' + 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio' + 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh' + 'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' + 'yajl' + ) + optdepends=( + 'afpfs-ng: Apple shares support' + 'bluez: Blutooth support' + 'libnfs: NFS shares support' + 'libplist: AirPlay support' + 'libcec: Pulse-Eight USB-CEC adapter support' + 'lirc: Remote controller support' + 'pulseaudio: PulseAudio support' + 'shairplay: AirPlay support' + 'udisks: Automount external drives' + 'unzip: Archives support' + 'upower: Display battery level' + ) + install="kodi.install" + provides=('xbmc' 'xbmc-lts') + conflicts=('xbmc' 'xbmc-lts') + replaces=('xbmc' 'xbmc-lts') + + cd "$srcdir/xbmc-$pkgver-$_codename" + # Running make install + make DESTDIR="$pkgdir" install + + # Licenses + install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} + for licensef in LICENSE.GPL copying.txt; do + mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \ + ${pkgdir}${_prefix}/share/licenses/${pkgname} + done +} diff --git a/libre/xbmc-lts/xbmc.install b/libre/kodi/kodi.install index 00ac17f74..31897532c 100644 --- a/libre/xbmc-lts/xbmc.install +++ b/libre/kodi/kodi.install @@ -1,16 +1,13 @@ post_install() { update_icons - update_autostart } post_upgrade() { update_icons - update_autostart } post_remove() { update_icons - update_autostart } update_icons() { @@ -18,7 +15,3 @@ update_icons() { type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications return 0 } - -update_autostart() { - echo "To autostart xbmc standalone read: https://wiki.parabola.nu/index.php/Xbmc#Autostarting_at_boot" -} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index c1c2183ab..c7bf0c074 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu -_pkgver=3.14.28-gnu +_pkgver=3.14.29-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -42,10 +42,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '8b1208650399e973c6c39e839f8480ad1b27feb775d5c7bdba0d529422cc6f7d' + '24fcfa602cef359cd9f6f319cbbe3efea9a0c2c38b7f934f434887c254b57bef' 'SKIP' - '3ebd2bb592b1455bb3d956ebaffcec265c2fda85a8106aceec8a0056589d8348' - 'c8edde146ccd451243801e5d3b7ab5927fa4b5bcac21debd6d5ce9dc79b32cf9' + '7c771ed094882d9df69271f19eab456c0266db6d5f8e680f18f4b1f4b89da066' + '42e5795bd25dfba1d1275bd28fc53209e18d4cf824cf7ae6c45b5ce5701800fc' '18a94cb727c2cae80b1dbd3cddbb1e5484458d4c01b026b69cea68bc2df162d7' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index f73037bcb..2d233b7dd 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.19-gnu-1-lts Kernel Configuration +# Linux/x86 3.14.21-gnu-1-lts Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -460,7 +460,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 4c18e3664..e4f6b9799 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.19-gnu-1-lts Kernel Configuration +# Linux/x86 3.14.21-gnu-1-lts Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -469,7 +469,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index af42d54c8..8075c2f64 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.18-gnu -_pkgver=3.18.2-gnu +_pkgver=3.18.3-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -18,7 +18,7 @@ _replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelna _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -39,7 +39,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '6ebb37b925d8d523a0d00450583dad3736287d8a1b6df05c90e66b8c6cc0fd57' + '28e6de2c7325d7b0c3856381678028969b97abb9224f9609a3d6563f560f24b8' 'SKIP' '2f03d1b7c6a198c3f5c1ff15583d468b93dd50d1c37d41a71075935eebb786e7' '81f1a730420c689da73554e323ca9cb4453aa20b8aeeed3864d3034b5470cc0b' diff --git a/libre/xbmc-lts/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch b/libre/xbmc-lts/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch deleted file mode 100644 index f2fc11b85..000000000 --- a/libre/xbmc-lts/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 14:42:30 +0100 -Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte - ---- - system/peripherals.xml | 2 +- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 57af5d1..5fcff7c 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -30,7 +30,7 @@ - <setting key="device_type" type="int" value="1" configurable="0" /> - <setting key="wake_devices_advanced" type="string" value="" configurable="0" /> - <setting key="standby_devices_advanced" type="string" value="" configurable="0" /> -- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" /> -+ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" /> - </peripheral> - - <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec"> -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 9907ba2..1d068dc 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -- // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch deleted file mode 100644 index 71841758e..000000000 --- a/libre/xbmc-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001 -From: BlackEagle <ike.devolder@gmail.com> -Date: Sun, 25 May 2014 12:10:01 +0200 -Subject: [PATCH] make sure applications/xbmc.desktop does'nt have executable - flag - -Signed-off-by: BlackEagle <ike.devolder@gmail.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 754f153..bee1fdd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -646,7 +646,7 @@ endif - endif - @# Icons and links - @install -d $(DESTDIR)$(datarootdir)/applications -- @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop -+ @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop - @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps - @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png - @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps --- -1.9.1 - diff --git a/libre/xbmc-lts/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch b/libre/xbmc-lts/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch deleted file mode 100644 index e8f583721..000000000 --- a/libre/xbmc-lts/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e59d7e028288464e6890141a830e4a83d4b9d065 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 15:32:36 +0100 -Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter - cannot be removed - ---- - xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -index b02535a..4941ae6 100644 ---- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) - break; - case ADAPTERTYPE_RPI: - result.m_mappedBusType = PERIPHERAL_BUS_RPI; -+ /** the Pi's adapter cannot be removed, no need to rescan */ -+ m_bNeedsPolling = false; - break; - default: - break; --- -2.1.2 - diff --git a/libre/xbmc-lts/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/libre/xbmc-lts/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 023257ca4..000000000 --- a/libre/xbmc-lts/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/libre/xbmc-lts/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch b/libre/xbmc-lts/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch deleted file mode 100644 index cd533962a..000000000 --- a/libre/xbmc-lts/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fa01c108b60f74abb16992c1376bcca896093eac Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 16:08:00 +0100 -Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for - the client version, because it will lead to issues when XBMC is rebuilt after - a libCEC bump that changes something - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index ad123d9..015daef 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - - void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - { -- // use the same client version as libCEC version -- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; -+ // client version matches the version of libCEC that we originally used the API from -+ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; - - // device name 'XBMC' - snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); --- -2.1.2 - diff --git a/libre/xbmc-lts/PKGBUILD b/libre/xbmc-lts/PKGBUILD deleted file mode 100644 index dc428191d..000000000 --- a/libre/xbmc-lts/PKGBUILD +++ /dev/null @@ -1,168 +0,0 @@ -# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> -# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> -# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> -# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> - -_prefix=/usr - -_pkgname=xbmc-libre-lts -pkgname=xbmc-lts -pkgver=12.3 -_codename=Frodo -pkgrel=11 -pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree decompression engine for RAR archives and support for nonfree addons" -arch=('i686' 'x86_64' 'mips64el') -url="http://xbmc.org" -license=('GPL2') -replaces=($_pkgname) -conflicts=(${pkgname%-lts} $_pkgname) -provides=(${pkgname%-lts}) -depends=( -'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' -'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libpulse' 'libjpeg-turbo' 'libsamplerate' -'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'python2-pillow' -'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' -'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' -'tinyxml' 'taglib' 'ffmpeg-compat' -) -makedepends=( -'boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' -'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-runtime-headless' -) -optdepends=( -'libcec: support for Pulse-Eight USB-CEC adapter' -'polkit: power management' -'lirc: remote controller support' -'udisks: automount external drives' -'upower: display battery level' -) -install="xbmc.install" -mksource=( - "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" -) -source=( - "https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-$_codename.tar.gz" - "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" - '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' - 'libnfs-header-changes.patch' - '0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch' - '0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch' - '0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch' - '0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch' -) -mkmd5sums=( - '7ae385ebf8e5cfcb917393235e6efbdb' -) -md5sums=( - '10ed8b9cb84b2825d746c26bd5236899' - '7fd6399d2ffbdf06b724f0cc2efa0784' - '8998bc505ae4c66604c90b1c005be8c2' - '27f1e75d99977d5bdd3eee58921514cb' - 'd00af955c000f285a230568004209117' - '3e810f451e58d5704cdd15b83552aa53' - 'b6346f66286195189e41839e9a23ef87' - '47b765e1d4299fac32bf92f108548d06' -) - -mksource() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - # remove nonfree unRAR utility files from the source - rm -rv lib/UnrarXLib -} - -prepare() { - cd "${srcdir}/xbmc-$pkgver-$_codename" - - patch -p0 <$srcdir/libass.patch - patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" - patch -p1 -i "$srcdir/libnfs-header-changes.patch" - patch -Np1 -i "$srcdir/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch" - patch -Np1 -i "$srcdir/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch" - patch -Np1 -i "$srcdir/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch" - patch -Np1 -i "$srcdir/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch" - - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp - - # use addons.xml from Parabola server (without nonfree addons support) - sed -i -e 's|mirrors[.]xbmc[.]org/addons/frodo/addons.xml|repo.parabola.nu/other/xbmc-libre-lts/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml -} - -build() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-pulse \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --enable-external-libraries \ - --with-lirc-device=/run/lirc/lircd \ - --enable-external-ffmpeg \ - --disable-non-free - - # Now (finally) build - make -} - -package() { - cd "$srcdir/xbmc-$pkgver-$_codename" - # Running make install - make DESTDIR="$pkgdir" install - - # run feh with python2 - sed -i -e 's/python/python2/g' ${pkgdir}$_prefix/bin/xbmc - - # lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}$_prefix/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}$_prefix/bin/xbmc" - - # Tools - install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \ - "${pkgdir}$_prefix/lib/xbmc/" - - # Licenses - install -dm755 "${pkgdir}$_prefix/share/licenses/$pkgname" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ - "${pkgdir}$_prefix/share/licenses/$pkgname" - done -} -# vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-lts/libnfs-header-changes.patch b/libre/xbmc-lts/libnfs-header-changes.patch deleted file mode 100644 index ef3d45e2c..000000000 --- a/libre/xbmc-lts/libnfs-header-changes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp -index 85084a5..8efa7bf 100644 ---- a/xbmc/filesystem/NFSDirectory.cpp -+++ b/xbmc/filesystem/NFSDirectory.cpp -@@ -37,6 +37,7 @@ - using namespace XFILE; - using namespace std; - #include <limits.h> -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - #include <nfsc/libnfs-raw-nfs.h> - -diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp -index 479f3fe..2aeea32 100644 ---- a/xbmc/filesystem/NFSFile.cpp -+++ b/xbmc/filesystem/NFSFile.cpp -@@ -32,6 +32,7 @@ - #include "network/DNSNameCache.h" - #include "threads/SystemClock.h" - -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - - #ifdef TARGET_WINDOWS diff --git a/libre/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch b/libre/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch deleted file mode 100644 index f2fc11b85..000000000 --- a/libre/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 14:42:30 +0100 -Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte - ---- - system/peripherals.xml | 2 +- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 57af5d1..5fcff7c 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -30,7 +30,7 @@ - <setting key="device_type" type="int" value="1" configurable="0" /> - <setting key="wake_devices_advanced" type="string" value="" configurable="0" /> - <setting key="standby_devices_advanced" type="string" value="" configurable="0" /> -- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" /> -+ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" /> - </peripheral> - - <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec"> -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 9907ba2..1d068dc 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -- // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/libre/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch b/libre/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch deleted file mode 100644 index e7aecd75e..000000000 --- a/libre/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6cd70921650dda8864a844033e36f1bea55d034b Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 12:29:09 +0100 -Subject: [PATCH 2/8] [CEC] bump libCEC to 2.2.0 - ---- - project/BuildDependencies/scripts/libcec_d.txt | 2 +- - tools/depends/target/libcec/Makefile | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt -index a126c74..3d0265e 100644 ---- a/project/BuildDependencies/scripts/libcec_d.txt -+++ b/project/BuildDependencies/scripts/libcec_d.txt -@@ -1,3 +1,3 @@ - ; filename source of the file - --libcec-2.1.4.zip http://mirrors.xbmc.org/build-deps/win32/ -+libcec-2.2.0-win32.zip http://mirrors.xbmc.org/build-deps/win32/ -diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile -index 16fec1b..6c72240 100644 ---- a/tools/depends/target/libcec/Makefile -+++ b/tools/depends/target/libcec/Makefile -@@ -3,9 +3,9 @@ DEPS= ../../Makefile.include Makefile - - # lib name, version - LIBNAME=libcec --VERSION=2.1.4 --SOURCE=$(LIBNAME)-$(VERSION)-2 --ARCHIVE=$(SOURCE).tar.gz -+VERSION=2.2.0 -+SOURCE=$(LIBNAME)-$(VERSION) -+ARCHIVE=$(SOURCE)-3.tar.gz - - # configuration settings - CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \ --- -2.1.2 - diff --git a/libre/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch b/libre/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch deleted file mode 100644 index e8f583721..000000000 --- a/libre/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e59d7e028288464e6890141a830e4a83d4b9d065 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 15:32:36 +0100 -Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter - cannot be removed - ---- - xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -index b02535a..4941ae6 100644 ---- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) - break; - case ADAPTERTYPE_RPI: - result.m_mappedBusType = PERIPHERAL_BUS_RPI; -+ /** the Pi's adapter cannot be removed, no need to rescan */ -+ m_bNeedsPolling = false; - break; - default: - break; --- -2.1.2 - diff --git a/libre/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch b/libre/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch deleted file mode 100644 index d4556ae29..000000000 --- a/libre/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 6544830d1a0b9810c2feb2fcb34df3f90b010d2f Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Mon, 27 Oct 2014 21:01:00 +0100 -Subject: [PATCH 4/8] [CEC] fixed: don't return garbage from CEC related app - messenger methods see - https://github.com/xbmc/xbmc/commit/19d37944ca2a2ac2f3e71a40a94e9ea289d8f2db#commitcomment-8248480 - ---- - xbmc/Application.cpp | 14 ++++++++------ - xbmc/ApplicationMessenger.cpp | 20 +++++--------------- - xbmc/ApplicationMessenger.h | 4 ++-- - 3 files changed, 15 insertions(+), 23 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index d5604dc..4d26183 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -2351,16 +2351,18 @@ - - if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState") || StringUtils::StartsWithNoCase(action.GetName(),"CECStandby")) - { -- bool ret = true; -- -- CLog::Log(LOGDEBUG, "%s: action %s [%d], toggling state of playing device", __FUNCTION__, action.GetName().c_str(), action.GetID()); - // do not wake up the screensaver right after switching off the playing device - if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState")) -- ret = CApplicationMessenger::Get().CECToggleState(); -+ { -+ CLog::Log(LOGDEBUG, "%s: action %s [%d], toggling state of playing device", __FUNCTION__, action.GetName().c_str(), action.GetID()); -+ if (!CApplicationMessenger::Get().CECToggleState()) -+ return true; -+ } - else -- ret = CApplicationMessenger::Get().CECStandby(); -- if (!ret) /* display is switched off */ -+ { -+ CApplicationMessenger::Get().CECStandby(); - return true; -+ } - } - - ResetScreenSaver(); -diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp -index 1a59c5c..d228273 100644 ---- a/xbmc/ApplicationMessenger.cpp -+++ b/xbmc/ApplicationMessenger.cpp -@@ -843,12 +843,12 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg) - } - case TMSG_CECACTIVATESOURCE: - { -- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE); -+ g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE); - break; - } - case TMSG_CECSTANDBY: - { -- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_STANDBY); -+ g_peripherals.ToggleDeviceState(STATE_STANDBY); - break; - } - case TMSG_START_ANDROID_ACTIVITY: -@@ -1396,29 +1396,19 @@ bool CApplicationMessenger::CECToggleState() - - ThreadMessage tMsg = {TMSG_CECTOGGLESTATE}; - tMsg.lpVoid = (void*)&result; -- SendMessage(tMsg, false); -+ SendMessage(tMsg, true); - - return result; - } - --bool CApplicationMessenger::CECActivateSource() -+void CApplicationMessenger::CECActivateSource() - { -- bool result; -- - ThreadMessage tMsg = {TMSG_CECACTIVATESOURCE}; -- tMsg.lpVoid = (void*)&result; - SendMessage(tMsg, false); -- -- return result; - } - --bool CApplicationMessenger::CECStandby() -+void CApplicationMessenger::CECStandby() - { -- bool result; -- - ThreadMessage tMsg = {TMSG_CECSTANDBY}; -- tMsg.lpVoid = (void*)&result; - SendMessage(tMsg, false); -- -- return result; - } -diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h -index 9013567..543e065 100644 ---- a/xbmc/ApplicationMessenger.h -+++ b/xbmc/ApplicationMessenger.h -@@ -219,8 +219,8 @@ public: - - void LoadProfile(unsigned int idx); - bool CECToggleState(); -- bool CECActivateSource(); -- bool CECStandby(); -+ void CECActivateSource(); -+ void CECStandby(); - - CStdString GetResponse(); - int SetResponse(CStdString response); --- -2.1.2 - diff --git a/libre/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/libre/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 023257ca4..000000000 --- a/libre/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/libre/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch b/libre/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch deleted file mode 100644 index cd533962a..000000000 --- a/libre/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fa01c108b60f74abb16992c1376bcca896093eac Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 16:08:00 +0100 -Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for - the client version, because it will lead to issues when XBMC is rebuilt after - a libCEC bump that changes something - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index ad123d9..015daef 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - - void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - { -- // use the same client version as libCEC version -- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; -+ // client version matches the version of libCEC that we originally used the API from -+ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; - - // device name 'XBMC' - snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); --- -2.1.2 - diff --git a/libre/xbmc/PKGBUILD b/libre/xbmc/PKGBUILD deleted file mode 100644 index 9312bfdec..000000000 --- a/libre/xbmc/PKGBUILD +++ /dev/null @@ -1,161 +0,0 @@ -# vim:set ts=2 sw=2 et: -# $Id: PKGBUILD 122391 2014-11-11 19:14:38Z idevolder $ -# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> -# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> -# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> -# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Contributor (Arch): Maxime Gauduin <alucryd@gmail.com> -# Maintainer: André Silva <emulatorman@parabola.nu> - -_prefix=/usr - -_pkgname=xbmc-libre -pkgname=xbmc -pkgver=13.2 -_codename=Gotham -pkgrel=6.parabola1 -pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree decompression engine for RAR archives and support for nonfree addons" -arch=('i686' 'x86_64' 'mips64el') -url="http://xbmc.org" -license=('GPL2') -replaces=($_pkgname) -conflicts=($_pkgname) -depends=( -'avahi' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad' -'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient' 'libpulse' -'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt' -'lzo' 'mesa' 'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image' -'smbclient' 'taglib' 'tinyxml' 'unzip' 'xorg-xdpyinfo' 'yajl' -) -makedepends=( -'afpfs-ng' 'libnfs' 'libplist' 'shairplay' 'libcec' 'boost' 'cmake' 'doxygen' -'gperf' 'jasper' 'java-runtime-headless' 'nasm' 'swig' 'taglib' 'udisks' -'zip' -) -optdepends=( -'afpfs-ng: Apple File Protocol suport' -'libnfs: NFS Share support' -'libplist: AirPlay support' -'shairplay: AirPlay support' -'libcec: Pulse-Eight USB-CEC adapter support' -'polkit: power management' -'pulseaudio: for pulseaudio support' -'lirc: remote controller support' -'udisks: automount external drives' -'upower: display battery level' -) -install="${pkgname}.install" -mksource=( - "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" -) -source=( - "https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-$_codename.tar.gz" - '0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch' - '0002-CEC-bump-libCEC-to-2.2.0.patch' - '0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch' - '0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch' - '0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch' - '0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch' -) -mksha256sums=( - 'acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585' -) -sha256sums=( - '4d7a4e157f8805211ea0e2e15a28d856caa698d8c28a493c5f54fa2c747615bf' - 'f4b436a64e32af6728fc9a584292b56de356d9090f0db0af30798a43aaa077f3' - '9d9ccbd140a71b90d43a22b7722804b9cb509b4e1e1fec02c0e2bceaed3b3958' - '0f0401189cc8481f05d7b68c50d66e18144c7d261be783e32c5b269f4b356ad7' - '33d6bd2b0da3d8563bfdf6059ad59ca10d9fe617e51990220ceb40d6fb3129d3' - 'd98f86ceefb039b43a66332658aeee4aff25370248955ece10d04ae21f33d2a9' - 'd829a5267f0b8042308b291366915253b3104d85a780a03cdaff6bec82493b95' -) - -mksource() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - msg2 "remove nonfree unRAR utility files from the source" - rm -rv lib/UnrarXLib -} - -prepare() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - patch -Np1 -i "$srcdir/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch" - patch -Np1 -i "$srcdir/0002-CEC-bump-libCEC-to-2.2.0.patch" - patch -Np1 -i "$srcdir/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch" - patch -Np1 -i "$srcdir/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch" - patch -Np1 -i "$srcdir/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch" - patch -Np1 -i "$srcdir/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch" - - find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + - sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl - sed 's/python/python2/' -i tools/Linux/xbmc.sh.in - - msg2 "Use addons.xml from Parabola server (without nonfree addons support)" - sed -i -e 's|mirrors[.]xbmc[.]org/addons/gotham/addons.xml|repo.parabola.nu/other/xbmc-libre/addons/gotham/addons.xml|' addons/repository.xbmc.org/addon.xml -} - -build() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-pulse \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --with-lirc-device=/run/lirc/lircd \ - --disable-non-free - - # Now (finally) build - make -} - -package() { - cd "$srcdir/xbmc-$pkgver-$_codename" - # Running make install - make DESTDIR="$pkgdir" install - - # Tools - install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \ - "${pkgdir}$_prefix/lib/xbmc/" - - # Licenses - install -dm755 "${pkgdir}$_prefix/share/licenses/$pkgname" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ - "${pkgdir}$_prefix/share/licenses/$pkgname" - done -} diff --git a/libre/xbmc/xbmc.install b/libre/xbmc/xbmc.install deleted file mode 100644 index 00ac17f74..000000000 --- a/libre/xbmc/xbmc.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - update_icons - update_autostart -} - -post_upgrade() { - update_icons - update_autostart -} - -post_remove() { - update_icons - update_autostart -} - -update_icons() { - type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications - return 0 -} - -update_autostart() { - echo "To autostart xbmc standalone read: https://wiki.parabola.nu/index.php/Xbmc#Autostarting_at_boot" -} diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 2e7baea8e..dd958f46e 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.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150104 -_gitver=df9bb2e7dde28bfc97c66f1a3d63603b08e29372 +pkgver=20150118 +_gitver=3e501411ea28a1c5cf4d86bc2fbb7ff552cb3260 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/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=('03c81195bf6d704ce3be005e85416102') +md5sums=('10aa4ee7e2cc264bc1cc225ce1f6efe1') package() { cd "$srcdir" diff --git a/pcr/filter_audio-git/COPYING b/pcr/filter_audio-git/COPYING new file mode 100644 index 000000000..da40b336c --- /dev/null +++ b/pcr/filter_audio-git/COPYING @@ -0,0 +1,29 @@ +Copyright (c) 2011, Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of Google nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pcr/filter_audio-git/Makefile b/pcr/filter_audio-git/Makefile new file mode 100644 index 000000000..f79ebc308 --- /dev/null +++ b/pcr/filter_audio-git/Makefile @@ -0,0 +1,24 @@ +LDLIBS = -lm -lpthread + +subdirs := agc ns aec other +sources := $(foreach dir,$(subdirs),$(wildcard $(dir)/*.c)) +objects := $(sources:.c=.o) + +programs := libfilteraudio.so +headers := filter_audio.h + +%.o: %.c + $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $< + +libfilteraudio.so: filter_audio.o $(objects) + $(CC) $(LDFLAGS) -shared -o $@ $^ $(LDLIBS) + +all: $(programs) + +clean: + rm -f $(objects) $(programs) + +install: $(programs) $(headers) + install -dm755 $(DESTDIR)/usr/lib $(DESTDIR)/usr/include + install -m755 $(programs) $(DESTDIR)/usr/lib + install -m644 $(headers) $(DESTDIR)/usr/include diff --git a/pcr/filter_audio-git/PKGBUILD b/pcr/filter_audio-git/PKGBUILD new file mode 100644 index 000000000..e29c31ccc --- /dev/null +++ b/pcr/filter_audio-git/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer (Arch): Ivan Shapovalov <intelfx100@gmail.com> + +pkgname=filter_audio-git +pkgver=r20.2c3678f +pkgrel=1 +pkgdesc="An easy to use audio filtering library made from webrtc code" +arch=('i686' 'x86_64') +url="https://github.com/irungentoo/filter_audio" +license=('custom:BSD') +makedepends=('git') +provides=("filter_audio") +conflicts=("filter_audio") +source=("git://github.com/irungentoo/filter_audio.git" + 'Makefile' + 'COPYING') +sha512sums=('SKIP' + 'c05ec200025f259f5ca60974339b3bba19b5d3612b1fb1fed7b7cdca26bb6dd17de63ce0b63f148af52ae391079b6b4575811ec5b6c4484ab509be878d93256a' + '2e1adab66b8b286d6ac5a373808e3f2e3a00c981bbede4bda16576d091e7df306b92aa24a8f759f53e0efcf12ca86d46e8d02845fd83d763c30f6153ee91ef23') + +pkgver() { + cd filter_audio + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + cd filter_audio + make -f "$srcdir/Makefile" +} + +package() { + cd filter_audio + make -f "$srcdir/Makefile" DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/pcr/lib32-pciutils/PKGBUILD b/pcr/lib32-pciutils/PKGBUILD new file mode 100644 index 000000000..3a6304885 --- /dev/null +++ b/pcr/lib32-pciutils/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Maintainer (Arch pciutils): Tobias Powalowski <tpowa@archlinux.org> +_pkgname=pciutils +pkgname=lib32-$_pkgname +pkgver=3.3.0 +pkgrel=1 +pkgdesc="PCI bus configuration space access library (32 bit)" +arch=(x86_64) +license=('GPL2') +#groups=('base') +url="http://mj.ucw.cz/sw/pciutils/" +depends=('glibc' 'hwids' 'kmod' "$_pkgname") +source=(#ftp://ftp.kernel.org/pub/software/utils/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${_pkgname}-${pkgver}.tar.gz) +md5sums=('b73bca5b1c2fd20a17a19f5040411521') + +options=(staticlibs) + +build() { + export CC='gcc -m32' + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgname}-${pkgver}" + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr LIBDIR=/usr/lib32 SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a + cp lib/libpci.a "${srcdir}/" + make clean + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr LIBDIR=/usr/lib32 SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make SHARED=yes PREFIX=/usr LIBDIR=/usr/lib32 SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install-lib + install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib32/" + rm -rf "$pkgdir/usr/include" +} diff --git a/pcr/pciutils-staticlibs/PKGBUILD b/pcr/pciutils-staticlibs/PKGBUILD new file mode 100644 index 000000000..5b52f41e1 --- /dev/null +++ b/pcr/pciutils-staticlibs/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Maintainer (Arch pcutils): Tobias Powalowski <tpowa@archlinux.org> +pkgname=pciutils +pkgver=3.3.0 +pkgrel=1 +pkgdesc="PCI bus configuration space access library and tools" +arch=(i686 x86_64) +license=('GPL2') +#groups=('base') +url="http://mj.ucw.cz/sw/pciutils/" +depends=('glibc' 'hwids' 'kmod') +source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) +md5sums=('b73bca5b1c2fd20a17a19f5040411521') + +options=(staticlibs) +_pkgname=$pkgname +pkgname+='-staticlibs' +pkgdesc+=" (build with options=(staticlibs))" +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a + cp lib/libpci.a "${srcdir}/" + make clean + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" + # this is now supplied by the hwids package + rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} +} diff --git a/pcr/qtox-git/PKGBUILD b/pcr/qtox-git/PKGBUILD new file mode 100644 index 000000000..91656e035 --- /dev/null +++ b/pcr/qtox-git/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer (Arch): Kevin MacMartin <prurigro at gmail dot com> + +_pkgname=qtox +pkgname=${_pkgname}-git +pkgver=r1827.c0fef78 +pkgrel=1 +pkgdesc="Powerful QT Tox client that tries to follow the Tox UI guidlines" +arch=('i686' 'x86_64') +url="https://github.com/tux3/qTox" +license=('GPL3') +depends=('desktop-file-utils' + 'filter_audio-git' + 'libxkbcommon-x11' + 'libxss' + 'opencv' + 'openal' + 'qt5-base' + 'tox-git>=r3070') +makedepends=('git' 'qt5-tools') +provides=("$_pkgname") +conflicts=("$_pkgname") +replaces=("$_pkgname") +install="${pkgname}.install" +source=("${_pkgname}::git+${url}.git") +sha512sums=('SKIP') + +pkgver() { + cd $_pkgname + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + cd $_pkgname + [[ -d 'libs' ]] \ + && rm -rf libs + install -d libs + ln -s /usr/lib libs/ + ln -s /usr/include libs/ +} + +build() { + cd $_pkgname + install -d build + cd build + qmake-qt5 .. + make +} + +package() { + cd $_pkgname + + # executable + install -Dm755 build/${_pkgname} "${pkgdir}/usr/bin/${_pkgname}" + + # xdg desktop file + install -Dm644 qTox.desktop "${pkgdir}/usr/share/applications/qTox.desktop" + + # icons + cd img/icons + for _icon in *.png; do + _size=$(sed 's|^[^-]*-||;s|\.png||' <<< $_icon) + install -Dm644 $_icon "$pkgdir"/usr/share/icons/hicolor/${_size}/apps/${_pkgname}.png + done + install -Dm644 ${_pkgname}.svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png +} diff --git a/pcr/qtox-git/qtox-git.install b/pcr/qtox-git/qtox-git.install new file mode 100644 index 000000000..fd791829a --- /dev/null +++ b/pcr/qtox-git/qtox-git.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_upgrade +} |